@univerjs/sheets 1.0.0-alpha.7 → 1.0.0-beta.0

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
@@ -159,7 +163,7 @@ const RangeThemeInterceptorId = "sheet.interceptor.range-theme-id";
 const IgnoreRangeThemeInterceptorKey = "sheet.interceptor.ignore-range-theme";
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -170,7 +174,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -183,14 +187,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPropertyKey.js
 function toPropertyKey(t) {
 	var i = toPrimitive(t, "string");
 	return "symbol" == _typeof(i) ? i : i + "";
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -201,7 +205,7 @@ function _defineProperty(e, r, t) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/decorateParam.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -209,7 +213,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorate.js
 function __decorate(decorators, target, key, desc) {
 	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
 	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -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);
@@ -1681,7 +1649,7 @@ const MoveRowsMutation = {
 	type: _univerjs_core.CommandType.MUTATION,
 	handler: (accessor, params) => {
 		const { unitId, subUnitId, sourceRange, targetRange } = params;
-		const univerSheet = accessor.get(_univerjs_core.IUniverInstanceService).getUniverSheetInstance(unitId);
+		const univerSheet = accessor.get(_univerjs_core.IUniverInstanceService).getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 		if (!univerSheet) throw new Error("[MoveRowMutation] univerSheet is null!");
 		const worksheet = univerSheet.getSheetBySheetId(subUnitId);
 		if (!worksheet) throw new Error("[MoveRowMutation] worksheet is null!");
@@ -1723,7 +1691,7 @@ const MoveColsMutation = {
 	type: _univerjs_core.CommandType.MUTATION,
 	handler: (accessor, params) => {
 		const { unitId, subUnitId, sourceRange, targetRange } = params;
-		const univerSheet = accessor.get(_univerjs_core.IUniverInstanceService).getUniverSheetInstance(unitId);
+		const univerSheet = accessor.get(_univerjs_core.IUniverInstanceService).getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 		if (!univerSheet) throw new Error("[MoveColumnMutation] univerSheet is null!");
 		const worksheet = univerSheet.getSheetBySheetId(subUnitId);
 		if (!worksheet) throw new Error("[MoveColumnMutation] worksheet is null!");
@@ -1754,7 +1722,7 @@ const RemoveRowMutation = {
 	id: "sheet.mutation.remove-rows",
 	type: _univerjs_core.CommandType.MUTATION,
 	handler: (accessor, params) => {
-		const universheet = accessor.get(_univerjs_core.IUniverInstanceService).getUniverSheetInstance(params.unitId);
+		const universheet = accessor.get(_univerjs_core.IUniverInstanceService).getUnit(params.unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 		if (universheet == null) throw new Error("universheet is null error!");
 		const worksheet = universheet.getSheetBySheetId(params.subUnitId);
 		if (!worksheet) return false;
@@ -1770,7 +1738,7 @@ const RemoveRowMutation = {
 	}
 };
 const RemoveColMutationFactory = (accessor, params) => {
-	const universheet = accessor.get(_univerjs_core.IUniverInstanceService).getUniverSheetInstance(params.unitId);
+	const universheet = accessor.get(_univerjs_core.IUniverInstanceService).getUnit(params.unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 	if (universheet == null) throw new Error("universheet is null error!");
 	const worksheet = universheet.getSheetBySheetId(params.subUnitId);
 	if (worksheet == null) throw new Error("worksheet is null error!");
@@ -1789,7 +1757,7 @@ const RemoveColMutation = {
 	id: "sheet.mutation.remove-col",
 	type: _univerjs_core.CommandType.MUTATION,
 	handler: (accessor, params) => {
-		const universheet = accessor.get(_univerjs_core.IUniverInstanceService).getUniverSheetInstance(params.unitId);
+		const universheet = accessor.get(_univerjs_core.IUniverInstanceService).getUnit(params.unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 		if (universheet == null) throw new Error("universheet is null error!");
 		const worksheet = universheet.getSheetBySheetId(params.subUnitId);
 		if (!worksheet) return false;
@@ -1957,7 +1925,7 @@ const SetColDataMutation = {
 //#endregion
 //#region src/commands/mutations/set-col-visible.mutation.ts
 const SetColHiddenUndoMutationFactory = (accessor, params) => {
-	if (accessor.get(_univerjs_core.IUniverInstanceService).getUniverSheetInstance(params.unitId) == null) throw new Error("universheet is null error!");
+	if (accessor.get(_univerjs_core.IUniverInstanceService).getUnit(params.unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET) == null) throw new Error("universheet is null error!");
 	return {
 		unitId: params.unitId,
 		subUnitId: params.subUnitId,
@@ -1968,7 +1936,7 @@ const SetColHiddenMutation = {
 	id: "sheet.mutation.set-col-hidden",
 	type: _univerjs_core.CommandType.MUTATION,
 	handler: (accessor, params) => {
-		const universheet = accessor.get(_univerjs_core.IUniverInstanceService).getUniverSheetInstance(params.unitId);
+		const universheet = accessor.get(_univerjs_core.IUniverInstanceService).getUnit(params.unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 		if (!universheet) return false;
 		const manager = universheet.getSheetBySheetId(params.subUnitId).getColumnManager();
 		for (let i = 0; i < params.ranges.length; i++) {
@@ -1982,7 +1950,7 @@ const SetColHiddenMutation = {
 	}
 };
 const SetColVisibleUndoMutationFactory = (accessor, params) => {
-	if (accessor.get(_univerjs_core.IUniverInstanceService).getUniverSheetInstance(params.unitId) == null) throw new Error("universheet is null error!");
+	if (accessor.get(_univerjs_core.IUniverInstanceService).getUnit(params.unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET) == null) throw new Error("universheet is null error!");
 	return {
 		unitId: params.unitId,
 		subUnitId: params.subUnitId,
@@ -1993,7 +1961,7 @@ const SetColVisibleMutation = {
 	id: "sheet.mutation.set-col-visible",
 	type: _univerjs_core.CommandType.MUTATION,
 	handler: (accessor, params) => {
-		const universheet = accessor.get(_univerjs_core.IUniverInstanceService).getUniverSheetInstance(params.unitId);
+		const universheet = accessor.get(_univerjs_core.IUniverInstanceService).getUnit(params.unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 		if (!universheet) return false;
 		const manager = universheet.getSheetBySheetId(params.subUnitId).getColumnManager();
 		for (let i = 0; i < params.ranges.length; i++) {
@@ -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;
@@ -2343,7 +2311,7 @@ function setNull(value) {
 */
 const SetRangeValuesUndoMutationFactory = (accessor, params) => {
 	const { unitId, subUnitId, cellValue, isOverrideStyle } = params;
-	const workbook = accessor.get(_univerjs_core.IUniverInstanceService).getUniverSheetInstance(unitId);
+	const workbook = accessor.get(_univerjs_core.IUniverInstanceService).getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 	if (workbook == null) throw new Error("workbook is null error!");
 	const worksheet = workbook.getSheetBySheetId(subUnitId);
 	if (worksheet == null) throw new Error("worksheet is null error!");
@@ -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 {
@@ -2473,7 +2441,7 @@ const SetRowDataMutation = {
 //#endregion
 //#region src/commands/mutations/set-row-visible.mutation.ts
 const SetRowVisibleUndoMutationFactory = (accessor, params) => {
-	if (accessor.get(_univerjs_core.IUniverInstanceService).getUniverSheetInstance(params.unitId) == null) throw new Error("universheet is null error!");
+	if (accessor.get(_univerjs_core.IUniverInstanceService).getUnit(params.unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET) == null) throw new Error("universheet is null error!");
 	return {
 		unitId: params.unitId,
 		subUnitId: params.subUnitId,
@@ -2484,7 +2452,7 @@ const SetRowVisibleMutation = {
 	id: "sheet.mutation.set-row-visible",
 	type: _univerjs_core.CommandType.MUTATION,
 	handler: (accessor, params) => {
-		const universheet = accessor.get(_univerjs_core.IUniverInstanceService).getUniverSheetInstance(params.unitId);
+		const universheet = accessor.get(_univerjs_core.IUniverInstanceService).getUnit(params.unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 		if (universheet == null) throw new Error("universheet is null error!");
 		const manager = universheet.getSheetBySheetId(params.subUnitId).getRowManager();
 		for (let i = 0; i < params.ranges.length; i++) {
@@ -2498,7 +2466,7 @@ const SetRowVisibleMutation = {
 	}
 };
 const SetRowHiddenUndoMutationFactory = (accessor, params) => {
-	if (accessor.get(_univerjs_core.IUniverInstanceService).getUniverSheetInstance(params.unitId) == null) throw new Error("universheet is null error!");
+	if (accessor.get(_univerjs_core.IUniverInstanceService).getUnit(params.unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET) == null) throw new Error("universheet is null error!");
 	return {
 		unitId: params.unitId,
 		subUnitId: params.subUnitId,
@@ -2509,7 +2477,7 @@ const SetRowHiddenMutation = {
 	id: "sheet.mutation.set-row-hidden",
 	type: _univerjs_core.CommandType.MUTATION,
 	handler: (accessor, params) => {
-		const universheet = accessor.get(_univerjs_core.IUniverInstanceService).getUniverSheetInstance(params.unitId);
+		const universheet = accessor.get(_univerjs_core.IUniverInstanceService).getUnit(params.unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 		if (universheet == null) throw new Error("universheet is null error!");
 		const manager = universheet.getSheetBySheetId(params.subUnitId).getRowManager();
 		for (let i = 0; i < params.ranges.length; i++) {
@@ -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;
 	}
@@ -3553,7 +3518,8 @@ const findAllRectangle = (topMatrix) => {
 * @returns {IRange[]}
 */
 const rangeMerge = (ranges) => {
-	return findAllRectangle(createTopMatrixFromRanges(ranges));
+	const topMatrix = createTopMatrixFromRanges(ranges);
+	return findAllRectangle(topMatrix);
 };
 var RangeMergeUtil = class {
 	constructor() {
@@ -3576,7 +3542,8 @@ var RangeMergeUtil = class {
 		return this;
 	}
 	merge() {
-		return findAllRectangle(createTopMatrixFromMatrix(this._matrix));
+		const topMatrix = createTopMatrixFromMatrix(this._matrix);
+		return findAllRectangle(topMatrix);
 	}
 };
 
@@ -4246,21 +4213,12 @@ var WorkbookSelectionModel = class extends _univerjs_core.Disposable {
 	getCurrentSelections() {
 		return this._getCurrentSelections();
 	}
-	/**
-	* @deprecated use `getSelectionsOfWorksheet` instead.
-	* @param sheetId
-	* @returns
-	*/
-	getSelectionOfWorksheet(sheetId) {
-		return this.getSelectionsOfWorksheet(sheetId);
-	}
 	getSelectionsOfWorksheet(sheetId) {
 		if (!this._worksheetSelections.has(sheetId)) this._worksheetSelections.set(sheetId, []);
 		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]);
@@ -4414,35 +4372,21 @@ 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);
 		}
 	}
 	clearCurrentSelections() {
 		this._getCurrentSelections().splice(0);
 	}
-	/**
-	* Determine whether multiple current selections overlap
-	*
-	* @deprecated this should be extracted to an pure function
-	*/
-	isOverlapping() {
-		const selectionDataList = this.getCurrentSelections();
-		if (selectionDataList == null) return false;
-		return selectionDataList.some(({ range }, index) => selectionDataList.some(({ range: range2 }, index2) => {
-			if (index === index2) return false;
-			return range.startRow <= range2.endRow && range.endRow >= range2.startRow && range.startColumn <= range2.endColumn && range.endColumn >= range2.startColumn;
-		}));
-	}
 	_getCurrentSelections() {
 		const current = this._currentSelectionPos;
 		if (!current) return [];
@@ -5057,6 +5001,9 @@ RefSelectionsService = __decorate([__decorateParam(0, _univerjs_core.IUniverInst
 
 //#endregion
 //#region src/commands/utils/selection-command-util.ts
+function hasOverlappingRanges(ranges) {
+	return ranges.some((range, index) => ranges.slice(index + 1).some((other) => _univerjs_core.Rectangle.simpleRangesIntersect(range, other)));
+}
 function getSelectionsService(accessor, fromCurrentSelection) {
 	const isInRefSelectionMode = accessor.get(_univerjs_core.IContextService).getContextValue(REF_SELECTIONS_ENABLED);
 	return accessor.get(isInRefSelectionMode && !fromCurrentSelection ? IRefSelectionsService : SheetsSelectionsService);
@@ -5131,15 +5078,14 @@ 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.getUniverSheetInstance(unitId);
+	const workbook = univerInstanceService.getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 	const fromWorksheet = workbook === null || workbook === void 0 ? void 0 : workbook.getSheetBySheetId(fromSubUnitId);
 	const toWorksheet = workbook === null || workbook === void 0 ? void 0 : workbook.getSheetBySheetId(toSubUnitId);
 	if (!fromWorksheet || !toWorksheet) return null;
@@ -5152,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;
@@ -5174,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
 	];
@@ -5247,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);
@@ -5258,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 = {
@@ -5326,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);
@@ -5354,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);
@@ -5414,7 +5357,7 @@ function getInsertRangeMutations(accessor, params) {
 	const { unitId, subUnitId, range, shiftDimension, cellValue = {} } = params;
 	const instanceService = accessor.get(_univerjs_core.IUniverInstanceService);
 	const sheetInterceptorService = accessor.get(SheetInterceptorService);
-	const workbook = instanceService.getUniverSheetInstance(unitId);
+	const workbook = instanceService.getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 	const worksheet = workbook === null || workbook === void 0 ? void 0 : workbook.getSheetBySheetId(subUnitId);
 	if (worksheet) {
 		const cellMatrix = worksheet.getCellMatrix();
@@ -5511,7 +5454,7 @@ function getRemoveRangeMutations(accessor, params) {
 	const { unitId, subUnitId, range, shiftDimension } = params;
 	const instanceService = accessor.get(_univerjs_core.IUniverInstanceService);
 	const sheetInterceptorService = accessor.get(SheetInterceptorService);
-	const workbook = instanceService.getUniverSheetInstance(unitId);
+	const workbook = instanceService.getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 	const worksheet = workbook === null || workbook === void 0 ? void 0 : workbook.getSheetBySheetId(subUnitId);
 	if (worksheet) {
 		const cellMatrix = worksheet.getCellMatrix();
@@ -5646,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);
@@ -5672,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,
@@ -5706,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);
@@ -5732,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,
@@ -5766,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);
@@ -5774,7 +5714,7 @@ const InsertRangeMoveDownCommand = {
 		const sheetInterceptorService = accessor.get(SheetInterceptorService);
 		const errorService = accessor.get(_univerjs_core.ErrorService);
 		const localeService = accessor.get(_univerjs_core.LocaleService);
-		if (selectionManagerService.isOverlapping()) {
+		if (hasOverlappingRanges(selectionManagerService.getCurrentSelections().map(({ range }) => range))) {
 			errorService.emit(localeService.t("sheets.info.overlappingSelections"));
 			return false;
 		}
@@ -5842,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({
@@ -5874,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);
@@ -5882,7 +5821,7 @@ const InsertRangeMoveRightCommand = {
 		const sheetInterceptorService = accessor.get(SheetInterceptorService);
 		const errorService = accessor.get(_univerjs_core.ErrorService);
 		const localeService = accessor.get(_univerjs_core.LocaleService);
-		if (selectionManagerService.isOverlapping()) {
+		if (hasOverlappingRanges(selectionManagerService.getCurrentSelections().map(({ range }) => range))) {
 			errorService.emit(localeService.t("sheets.info.overlappingSelections"));
 			return false;
 		}
@@ -5950,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({
@@ -6004,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;
@@ -6047,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,
@@ -6227,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;
@@ -6270,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,
@@ -6436,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;
@@ -6455,10 +6391,11 @@ const RemoveRowByRangeCommand = {
 				range: visibleRange
 			};
 			const undoRemoveRowsParams = RemoveRowsUndoMutationFactory(removeRowsParams, worksheet);
+			const removedRows = worksheet.getCellMatrix().getSlice(visibleRange.startRow, visibleRange.endRow, 0, worksheet.getColumnCount() - 1);
 			const undoSetRangeValuesParams = {
 				unitId,
 				subUnitId,
-				cellValue: worksheet.getCellMatrix().getSlice(visibleRange.startRow, visibleRange.endRow, 0, worksheet.getColumnCount() - 1).getMatrix()
+				cellValue: removedRows.getMatrix()
 			};
 			redos.push({
 				id: RemoveRowMutation.id,
@@ -6475,33 +6412,33 @@ const RemoveRowByRangeCommand = {
 			redoMutations.push(...redos);
 			undoMutations.unshift(...undos);
 		});
+		const interceptorParams = params;
 		const intercepted = sheetInterceptorService.onCommandExecute({
 			id: RemoveRowCommandId,
-			params: { range }
+			params: interceptorParams
 		});
 		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,
-				params: { range }
+				params: interceptorParams
 			});
 			(0, _univerjs_core.sequenceExecute)(afterInterceptors.redos, commandService);
 			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
@@ -6535,7 +6472,11 @@ const RemoveRowCommand = {
 		};
 		if (!await sheetInterceptorService.beforeCommandExecute({
 			id: RemoveRowCommand.id,
-			params: { range }
+			params: {
+				range,
+				unitId,
+				subUnitId
+			}
 		})) return false;
 		return commandService.syncExecuteCommand(RemoveRowByRangeCommand.id, {
 			range,
@@ -6549,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;
@@ -6567,30 +6507,30 @@ const RemoveColByRangeCommand = {
 			subUnitId,
 			cellValue: worksheet.getCellMatrix().getSlice(0, worksheet.getRowCount() - 1, range.startColumn, range.endColumn).getMatrix()
 		};
+		const interceptorParams = params;
 		const intercepted = sheetInterceptorService.onCommandExecute({
 			id: RemoveColCommandId,
-			params: { range }
+			params: interceptorParams
 		});
 		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,
-				params: { range }
+				params: interceptorParams
 			});
 			(0, _univerjs_core.sequenceExecute)(afterInterceptors.redos, commandService);
 			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
@@ -6603,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
@@ -6631,7 +6571,7 @@ const RemoveColCommand = {
 		let range = params === null || params === void 0 ? void 0 : params.range;
 		if (!range) range = (_selectionManagerServ2 = selectionManagerService.getCurrentLastSelection()) === null || _selectionManagerServ2 === void 0 ? void 0 : _selectionManagerServ2.range;
 		if (!range) return false;
-		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService));
+		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService), params);
 		if (!target) return false;
 		const { worksheet, subUnitId, unitId } = target;
 		range = {
@@ -6641,7 +6581,11 @@ const RemoveColCommand = {
 		};
 		if (!await sheetInterceptorService.beforeCommandExecute({
 			id: RemoveColCommand.id,
-			params: { range }
+			params: {
+				range,
+				unitId,
+				subUnitId
+			}
 		})) return false;
 		return commandService.syncExecuteCommand(RemoveColByRangeCommand.id, {
 			range,
@@ -6679,7 +6623,7 @@ const RemoveSheetMutation = {
 	handler: (accessor, params) => {
 		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
 		const { subUnitId, unitId } = params;
-		const workbook = univerInstanceService.getUniverSheetInstance(unitId);
+		const workbook = univerInstanceService.getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 		if (!workbook) return false;
 		return workbook.removeSheet(subUnitId);
 	}
@@ -6701,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();
@@ -6743,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
 		}];
@@ -6813,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();
@@ -6855,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
 		}];
@@ -6934,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 = {
@@ -6956,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
 		];
@@ -7180,9 +7121,8 @@ const handleReorderRangeCommon = (param, targetRange) => {
 	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;
+			const cloneCell = matrix.getValue(targetRow, col) ?? 0;
 			cacheMatrix.setValue(row, col, cloneCell);
 		}
 	});
@@ -7260,7 +7200,7 @@ const handleMoveRangeCommon = (param, targetRange) => {
 		matrix.setValue(row, col, 1);
 	});
 	const fromMatrix = new _univerjs_core.ObjectMatrix();
-	const loopFromRange = _univerjs_core.Rectangle.getIntersects(fromRange, targetRange);
+	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);
@@ -7276,10 +7216,9 @@ const handleMoveRangeCommon = (param, targetRange) => {
 		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);
+		matrix.setValue(targetRow, targetCol, fromMatrix.getValue(row, col) ?? 0);
 	});
 	return (0, _univerjs_core.queryObjectMatrix)(matrix, (value) => value === 1);
 };
@@ -7290,7 +7229,7 @@ const handleBaseRemoveRange = (_removeRange, _targetRange) => {
 	const getRowLength = (range) => range.endRow - range.startRow + 1;
 	if (removeRange.startRow <= targetRange.startRow && removeRange.endRow >= targetRange.endRow) {
 		if (targetRange.startColumn < removeRange.startColumn && targetRange.endColumn >= removeRange.startColumn && targetRange.endColumn <= removeRange.endColumn || targetRange.startColumn < removeRange.startColumn && targetRange.endColumn >= removeRange.endColumn) {
-			const intersectedRange = _univerjs_core.Rectangle.getIntersects(targetRange, removeRange);
+			const intersectedRange = (0, _univerjs_core.getIntersectRange)(targetRange, removeRange);
 			if (intersectedRange) return {
 				step: 0,
 				length: -getLength(intersectedRange)
@@ -7298,7 +7237,7 @@ const handleBaseRemoveRange = (_removeRange, _targetRange) => {
 		}
 		if (targetRange.startColumn >= removeRange.startColumn && targetRange.endColumn <= removeRange.endColumn && getRowLength(removeRange) >= getRowLength(targetRange)) return null;
 		if (targetRange.startColumn >= removeRange.startColumn && targetRange.startColumn <= removeRange.endColumn && targetRange.endColumn > removeRange.endColumn) {
-			const intersectedRange = _univerjs_core.Rectangle.getIntersects(targetRange, removeRange);
+			const intersectedRange = (0, _univerjs_core.getIntersectRange)(targetRange, removeRange);
 			if (intersectedRange) {
 				const length = -getLength(intersectedRange);
 				return {
@@ -7489,7 +7428,7 @@ const handleInsertRangeMoveDownCommon = (param, targetRange) => {
 		endRow: Number.POSITIVE_INFINITY
 	};
 	const noMoveRanges = _univerjs_core.Rectangle.subtract(targetRange, bottomRange);
-	const targetMoveRange = _univerjs_core.Rectangle.getIntersects(bottomRange, targetRange);
+	const targetMoveRange = (0, _univerjs_core.getIntersectRange)(bottomRange, targetRange);
 	if (!targetMoveRange) return [targetRange];
 	const matrix = new _univerjs_core.ObjectMatrix();
 	noMoveRanges.forEach((noMoveRange) => {
@@ -7526,7 +7465,7 @@ const handleInsertRangeMoveRightCommon = (param, targetRange) => {
 		endColumn: Number.POSITIVE_INFINITY
 	};
 	const noMoveRanges = _univerjs_core.Rectangle.subtract(targetRange, bottomRange);
-	const targetMoveRange = _univerjs_core.Rectangle.getIntersects(bottomRange, targetRange);
+	const targetMoveRange = (0, _univerjs_core.getIntersectRange)(bottomRange, targetRange);
 	if (!targetMoveRange) return [targetRange];
 	const matrix = new _univerjs_core.ObjectMatrix();
 	noMoveRanges.forEach((noMoveRange) => {
@@ -7567,9 +7506,9 @@ const handleDeleteRangeMoveLeftCommon = (param, targetRange) => {
 		endColumn: Number.POSITIVE_INFINITY
 	};
 	const moveCount = range.endColumn - range.startColumn + 1;
-	const targetDeleteRange = _univerjs_core.Rectangle.getIntersects(range, targetRange);
+	const targetDeleteRange = (0, _univerjs_core.getIntersectRange)(range, targetRange);
 	const noMoveRanges = _univerjs_core.Rectangle.subtract(targetRange, rightRange);
-	const targetMoveRange = _univerjs_core.Rectangle.getIntersects(rightRange, targetRange);
+	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) => {
@@ -7612,9 +7551,9 @@ const handleDeleteRangeMoveUpCommon = (param, targetRange) => {
 		endRow: Number.POSITIVE_INFINITY
 	};
 	const moveCount = range.endRow - range.startRow + 1;
-	const targetDeleteRange = _univerjs_core.Rectangle.getIntersects(range, targetRange);
+	const targetDeleteRange = (0, _univerjs_core.getIntersectRange)(range, targetRange);
 	const noMoveRanges = _univerjs_core.Rectangle.subtract(targetRange, bottomRange);
-	const targetMoveRange = _univerjs_core.Rectangle.getIntersects(bottomRange, targetRange);
+	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) => {
@@ -7631,8 +7570,7 @@ const handleDeleteRangeMoveUpCommon = (param, targetRange) => {
 	return (0, _univerjs_core.queryObjectMatrix)(matrix, (v) => v === 1);
 };
 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--) {
@@ -8092,7 +8030,7 @@ function getSeparateEffectedRangesOnCommand(accessor, command) {
 		}
 		case EffectRefRangId.RemoveRowCommandId: {
 			const params = command.params;
-			const target = getSheetCommandTarget(univerInstanceService);
+			const target = getSheetCommandTarget(univerInstanceService, params);
 			if (!target) return;
 			const { worksheet, unitId, subUnitId } = target;
 			const { range } = params;
@@ -8108,7 +8046,7 @@ function getSeparateEffectedRangesOnCommand(accessor, command) {
 		}
 		case EffectRefRangId.RemoveColCommandId: {
 			const params = command.params;
-			const target = getSheetCommandTarget(univerInstanceService);
+			const target = getSheetCommandTarget(univerInstanceService, params);
 			if (!target) return;
 			const { worksheet, unitId, subUnitId } = target;
 			const { range } = params;
@@ -8183,8 +8121,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;
@@ -8223,6 +8162,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", () => {
@@ -8254,15 +8195,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);
@@ -8301,7 +8241,7 @@ let RefRangeService = class RefRangeService extends _univerjs_core.Disposable {
 						}
 						case EffectRefRangId.RemoveRowCommandId: {
 							const params = command.params;
-							const target = getSheetCommandTarget(this._univerInstanceService);
+							const target = getSheetCommandTarget(this._univerInstanceService, params);
 							if (!target) return [];
 							const { worksheet, unitId, subUnitId } = target;
 							const effectRange = {
@@ -8315,7 +8255,7 @@ let RefRangeService = class RefRangeService extends _univerjs_core.Disposable {
 						}
 						case EffectRefRangId.RemoveColCommandId: {
 							const params = command.params;
-							const target = getSheetCommandTarget(this._univerInstanceService);
+							const target = getSheetCommandTarget(this._univerInstanceService, params);
 							if (!target) return [];
 							const { worksheet, unitId, subUnitId } = target;
 							const effectRange = {
@@ -8380,11 +8320,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: [],
@@ -8475,18 +8414,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);
@@ -8744,7 +8687,7 @@ let MergeCellController = class MergeCellController extends _univerjs_core.Dispo
 	}
 	_onRefRangeChange() {
 		const registerRefRange = (unitId, subUnitId) => {
-			const workbook = this._univerInstanceService.getUniverSheetInstance(unitId);
+			const workbook = this._univerInstanceService.getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 			if (!workbook) return;
 			const workSheet = workbook === null || workbook === void 0 ? void 0 : workbook.getSheetBySheetId(subUnitId);
 			if (!workSheet) return;
@@ -8880,11 +8823,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();
@@ -9444,7 +9386,7 @@ let MergeCellController = class MergeCellController extends _univerjs_core.Dispo
 		this.disposeWithMe(this._commandService.onCommandExecuted((command) => {
 			if (mutationIdArrByMove$1.includes(command.id)) {
 				if (!command.params) return;
-				const workbook = this._univerInstanceService.getUniverSheetInstance(command.params.unitId);
+				const workbook = this._univerInstanceService.getUnit(command.params.unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 				if (!workbook) return;
 				const worksheet = workbook.getSheetBySheetId(command.params.subUnitId);
 				if (!worksheet) return;
@@ -9493,7 +9435,7 @@ let MergeCellController = class MergeCellController extends _univerjs_core.Dispo
 				});
 			}
 			if (mutationIdByRowCol$1.includes(command.id)) {
-				const workbook = this._univerInstanceService.getUniverSheetInstance(command.params.unitId);
+				const workbook = this._univerInstanceService.getUnit(command.params.unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 				if (!workbook) return;
 				const worksheet = workbook.getSheetBySheetId(command.params.subUnitId);
 				if (!worksheet) return;
@@ -9558,7 +9500,7 @@ MergeCellController = __decorate([
 	__decorateParam(5, (0, _univerjs_core.Inject)(SheetsSelectionsService))
 ], MergeCellController);
 function getWorkbook(univerInstanceService, unitId) {
-	if (unitId) return univerInstanceService.getUniverSheetInstance(unitId);
+	if (unitId) return univerInstanceService.getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 	return univerInstanceService.getCurrentUnitOfType(_univerjs_core.UniverInstanceType.UNIVER_SHEET);
 }
 function getWorksheet(workbook, subUnitId) {
@@ -9774,10 +9716,11 @@ function getClearContentMutationParamsForRanges(accessor, unitId, worksheet, ran
 	const redos = [];
 	const subUnitId = worksheet.getSheetId();
 	ranges.forEach((range) => {
+		const redoMatrix = getClearContentMutationParamForRange(worksheet, range);
 		const redoMutationParams = {
 			unitId,
 			subUnitId,
-			cellValue: getClearContentMutationParamForRange(worksheet, range).getData()
+			cellValue: redoMatrix.clone()
 		};
 		const undoMutationParams = SetRangeValuesUndoMutationFactory(accessor, redoMutationParams);
 		undos.push({
@@ -9801,8 +9744,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,
@@ -11565,7 +11508,8 @@ const AutoFillRules = {
 			const dataNumArr = [];
 			for (let i = 0; i < data.length; i++) {
 				var _data$i;
-				const matchResult = matchExtendNumber(`${(_data$i = data[i]) === null || _data$i === void 0 ? void 0 : _data$i.v}`);
+				const txt = `${(_data$i = data[i]) === null || _data$i === void 0 ? void 0 : _data$i.v}`;
+				const matchResult = matchExtendNumber(txt);
 				if (matchResult.isExtendNumber) dataNumArr.push(matchResult.matchNumber);
 			}
 			if (isReverse) {
@@ -11631,9 +11575,11 @@ const AutoFillRules = {
 			if (isEqualDiff(dataNumArr)) {
 				if (hasWeek || dataNumArr[dataNumArr.length - 1] < 6 && dataNumArr[0] > 0 || dataNumArr[0] < 6 && dataNumArr[dataNumArr.length - 1] > 0) {
 					const dataLen = data.length;
-					return reverseIfNeed(fillChnWeek(data, len, dataNumArr[dataLen - 1] - dataNumArr[dataLen - 2]), isReverse);
+					const step = dataNumArr[dataLen - 1] - dataNumArr[dataLen - 2];
+					return reverseIfNeed(fillChnWeek(data, len, step), isReverse);
 				}
-				return reverseIfNeed(fillChnNumber(data, len, dataNumArr[1] - dataNumArr[0]), isReverse);
+				const step = dataNumArr[1] - dataNumArr[0];
+				return reverseIfNeed(fillChnNumber(data, len, step), isReverse);
 			}
 			return fillCopy$1(data, len);
 		} }
@@ -11674,7 +11620,8 @@ const AutoFillRules = {
 			}
 			if (isEqualDiff(dataNumArr)) {
 				const dataLen = data.length;
-				return reverseIfNeed(fillChnWeek(data, len, dataNumArr[dataLen - 1] - dataNumArr[dataLen - 2], 1), isReverse);
+				const step = dataNumArr[dataLen - 1] - dataNumArr[dataLen - 2];
+				return reverseIfNeed(fillChnWeek(data, len, step, 1), isReverse);
 			}
 			return fillCopy$1(data, len);
 		} }
@@ -11714,7 +11661,8 @@ const AutoFillRules = {
 			}
 			if (isEqualDiff(dataNumArr)) {
 				const dataLen = data.length;
-				return reverseIfNeed(fillChnWeek(data, len, dataNumArr[dataLen - 1] - dataNumArr[dataLen - 2], 2), isReverse);
+				const step = dataNumArr[dataLen - 1] - dataNumArr[dataLen - 2];
+				return reverseIfNeed(fillChnWeek(data, len, step, 2), isReverse);
 			}
 			return fillCopy$1(data, len);
 		} }
@@ -11759,7 +11707,8 @@ const AutoFillRules = {
 			}
 			if (isEqualDiff(dataNumArr)) {
 				const dataLen = data.length;
-				return reverseIfNeed(fillLoopSeries(data, len, dataNumArr[dataLen - 1] - dataNumArr[dataLen - 2], series), isReverse);
+				const step = dataNumArr[dataLen - 1] - dataNumArr[dataLen - 2];
+				return reverseIfNeed(fillLoopSeries(data, len, step, series), isReverse);
 			}
 			return fillCopy$1(data, len);
 		} }
@@ -12551,7 +12500,7 @@ const InsertSheetMutation = {
 	handler: (accessor, params) => {
 		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
 		const { sheet, index, unitId, styles } = params;
-		const workbook = univerInstanceService.getUniverSheetInstance(unitId);
+		const workbook = univerInstanceService.getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 		if (!workbook) return false;
 		if (styles) workbook.addStyles(styles);
 		return workbook.addWorksheet(sheet.id, index, (0, _univerjs_core.cloneWorksheetData)(sheet));
@@ -12619,7 +12568,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,
@@ -12664,7 +12612,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
@@ -12672,7 +12620,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
@@ -12887,8 +12835,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 {
@@ -13003,7 +12950,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);
@@ -13014,7 +12960,7 @@ const RemoveDefinedNameCommand = {
 			params
 		});
 		const redos = [
-			...(_interceptorCommands$ = interceptorCommands.preRedos) !== null && _interceptorCommands$ !== void 0 ? _interceptorCommands$ : [],
+			...interceptorCommands.preRedos ?? [],
 			{
 				id: _univerjs_engine_formula.RemoveDefinedNameMutation.id,
 				params: removeSheetMutationParams
@@ -13022,7 +12968,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
@@ -13050,7 +12996,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);
@@ -13080,7 +13025,7 @@ const RemoveSheetCommand = {
 			}
 		});
 		const redos = [
-			...(_intercepted$preRedos = intercepted.preRedos) !== null && _intercepted$preRedos !== void 0 ? _intercepted$preRedos : [],
+			...intercepted.preRedos ?? [],
 			{
 				id: RemoveSheetMutation.id,
 				params: RemoveSheetMutationParams
@@ -13088,7 +13033,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
@@ -13462,7 +13407,7 @@ const SetBorderCommand = {
 		const setRangeValuesMutationParams = {
 			unitId,
 			subUnitId,
-			cellValue: mr.getData()
+			cellValue: mr.clone()
 		};
 		const undoSetRangeValuesMutationParams = SetRangeValuesUndoMutationFactory(accessor, setRangeValuesMutationParams);
 		if (commandService.syncExecuteCommand(SetRangeValuesMutation.id, setRangeValuesMutationParams)) {
@@ -13618,7 +13563,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
@@ -13635,11 +13579,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
@@ -13729,7 +13673,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
@@ -13746,11 +13689,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
@@ -13859,7 +13802,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);
@@ -13871,7 +13813,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
@@ -13883,7 +13825,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
@@ -13909,7 +13851,7 @@ const SetDefinedNameCommand = {
 //#endregion
 //#region src/commands/mutations/set-frozen.mutation.ts
 const SetFrozenMutationFactory = (accessor, params) => {
-	const universheet = accessor.get(_univerjs_core.IUniverInstanceService).getUniverSheetInstance(params.unitId);
+	const universheet = accessor.get(_univerjs_core.IUniverInstanceService).getUnit(params.unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 	if (universheet == null) throw new Error("universheet is null error!");
 	const worksheet = universheet.getSheetBySheetId(params.subUnitId);
 	if (worksheet == null) throw new Error("worksheet is null error!");
@@ -13924,7 +13866,7 @@ const SetFrozenMutation = {
 	id: "sheet.mutation.set-frozen",
 	type: _univerjs_core.CommandType.MUTATION,
 	handler: (accessor, params) => {
-		const universheet = accessor.get(_univerjs_core.IUniverInstanceService).getUniverSheetInstance(params.unitId);
+		const universheet = accessor.get(_univerjs_core.IUniverInstanceService).getUnit(params.unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 		if (universheet == null) throw new Error("universheet is null error!");
 		const worksheet = universheet.getSheetBySheetId(params.subUnitId);
 		if (!worksheet) return false;
@@ -14349,7 +14291,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
@@ -14358,7 +14299,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
@@ -14367,11 +14308,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
@@ -14413,7 +14354,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);
@@ -14455,7 +14396,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
@@ -14466,7 +14407,6 @@ const SetRowHiddenCommand = {
 			},
 			...intercepted.redos
 		], commandService).result) {
-			var _intercepted$preUndos2, _intercepted$undos2, _intercepted$preRedos3;
 			const afterInterceptors = sheetInterceptorService.afterCommandExecute({
 				id: SetRowHiddenCommand.id,
 				params: redoMutationParams
@@ -14475,7 +14415,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
@@ -14484,11 +14424,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
@@ -14584,7 +14524,7 @@ function mergeSelections(ranges) {
 //#endregion
 //#region src/commands/mutations/set-tab-color.mutation.ts
 const SetTabColorUndoMutationFactory = (accessor, params) => {
-	const oldTabColor = accessor.get(_univerjs_core.IUniverInstanceService).getUniverSheetInstance(params.unitId).getSheetBySheetId(params.subUnitId).getConfig().tabColor;
+	const oldTabColor = accessor.get(_univerjs_core.IUniverInstanceService).getUnit(params.unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET).getSheetBySheetId(params.subUnitId).getConfig().tabColor;
 	return {
 		..._univerjs_core.Tools.deepClone(params),
 		color: oldTabColor
@@ -14594,7 +14534,7 @@ const SetTabColorMutation = {
 	id: "sheet.mutation.set-tab-color",
 	type: _univerjs_core.CommandType.MUTATION,
 	handler: (accessor, params) => {
-		const workbook = accessor.get(_univerjs_core.IUniverInstanceService).getUniverSheetInstance(params.unitId);
+		const workbook = accessor.get(_univerjs_core.IUniverInstanceService).getUnit(params.unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 		if (!workbook) return false;
 		const worksheet = workbook.getSheetBySheetId(params.subUnitId);
 		if (!worksheet) return false;
@@ -14660,7 +14600,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;
@@ -14673,7 +14612,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
@@ -14849,7 +14788,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
@@ -14858,7 +14796,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
@@ -14868,7 +14806,7 @@ const SetColWidthCommand = {
 					...autoHeightUndos
 				],
 				redoMutations: [
-					...(_intercepted$preRedos = intercepted.preRedos) !== null && _intercepted$preRedos !== void 0 ? _intercepted$preRedos : [],
+					...intercepted.preRedos ?? [],
 					{
 						id: SetWorksheetColWidthMutation.id,
 						params: redoMutationParams
@@ -14999,7 +14937,7 @@ const SetWorksheetHideMutation = {
 	id: "sheet.mutation.set-worksheet-hidden",
 	type: _univerjs_core.CommandType.MUTATION,
 	handler: (accessor, params) => {
-		const universheet = accessor.get(_univerjs_core.IUniverInstanceService).getUniverSheetInstance(params.unitId);
+		const universheet = accessor.get(_univerjs_core.IUniverInstanceService).getUnit(params.unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 		if (universheet == null) return false;
 		const worksheet = universheet.getSheetBySheetId(params.subUnitId);
 		if (!worksheet) return false;
@@ -15066,7 +15004,7 @@ const SetWorksheetNameMutation = {
 	id: "sheet.mutation.set-worksheet-name",
 	type: _univerjs_core.CommandType.MUTATION,
 	handler: (accessor, params) => {
-		const universheet = accessor.get(_univerjs_core.IUniverInstanceService).getUniverSheetInstance(params.unitId);
+		const universheet = accessor.get(_univerjs_core.IUniverInstanceService).getUnit(params.unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 		if (universheet == null) return false;
 		const worksheet = universheet.getSheetBySheetId(params.subUnitId);
 		if (!worksheet) return false;
@@ -15084,7 +15022,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);
@@ -15102,7 +15039,7 @@ const SetWorksheetNameCommand = {
 			params
 		});
 		const redos = [
-			...(_interceptorCommands$ = interceptorCommands.preRedos) !== null && _interceptorCommands$ !== void 0 ? _interceptorCommands$ : [],
+			...interceptorCommands.preRedos ?? [],
 			{
 				id: SetWorksheetNameMutation.id,
 				params: redoMutationParams
@@ -15110,7 +15047,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
@@ -15142,7 +15079,7 @@ const SetWorksheetOrderMutation = {
 	id: "sheet.mutation.set-worksheet-order",
 	type: _univerjs_core.CommandType.MUTATION,
 	handler: (accessor, params) => {
-		const workbook = accessor.get(_univerjs_core.IUniverInstanceService).getUniverSheetInstance(params.unitId);
+		const workbook = accessor.get(_univerjs_core.IUniverInstanceService).getUnit(params.unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 		if (!workbook) return false;
 		const config = workbook.getConfig();
 		config.sheetOrder.splice(params.fromOrder, 1);
@@ -16379,7 +16316,7 @@ const SetWorksheetProtectionCommand = {
 //#endregion
 //#region src/commands/mutations/set-worksheet-right-to-left.mutation.ts
 const SetWorksheetRightToLeftUndoMutationFactory = (accessor, params) => {
-	const oldState = accessor.get(_univerjs_core.IUniverInstanceService).getUniverSheetInstance(params.unitId).getSheetBySheetId(params.subUnitId).getConfig().rightToLeft;
+	const oldState = accessor.get(_univerjs_core.IUniverInstanceService).getUnit(params.unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET).getSheetBySheetId(params.subUnitId).getConfig().rightToLeft;
 	return {
 		..._univerjs_core.Tools.deepClone(params),
 		rightToLeft: oldState
@@ -16389,7 +16326,7 @@ const SetWorksheetRightToLeftMutation = {
 	id: "sheet.mutation.set-worksheet-right-to-left",
 	type: _univerjs_core.CommandType.MUTATION,
 	handler: (accessor, params) => {
-		const workbook = accessor.get(_univerjs_core.IUniverInstanceService).getUniverSheetInstance(params.unitId);
+		const workbook = accessor.get(_univerjs_core.IUniverInstanceService).getUnit(params.unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 		if (!workbook) return false;
 		const worksheet = workbook.getSheetBySheetId(params.subUnitId);
 		if (!worksheet) return false;
@@ -16411,10 +16348,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,
@@ -16547,7 +16481,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
@@ -16556,7 +16489,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
@@ -16569,7 +16502,7 @@ const DeltaRowHeightCommand = {
 					...afterInterceptors.undos
 				],
 				redoMutations: [
-					...(_intercepted$preRedos = intercepted.preRedos) !== null && _intercepted$preRedos !== void 0 ? _intercepted$preRedos : [],
+					...intercepted.preRedos ?? [],
 					{
 						id: SetWorksheetRowHeightMutation.id,
 						params: redoMutationParams
@@ -16629,7 +16562,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
@@ -16638,7 +16570,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
@@ -16651,7 +16583,7 @@ const SetRowHeightCommand = {
 					...afterInterceptors.undos
 				],
 				redoMutations: [
-					...(_intercepted$preRedos3 = intercepted.preRedos) !== null && _intercepted$preRedos3 !== void 0 ? _intercepted$preRedos3 : [],
+					...intercepted.preRedos ?? [],
 					{
 						id: SetWorksheetRowHeightMutation.id,
 						params: redoMutationParams
@@ -17607,7 +17539,7 @@ let AutoFillController = class AutoFillController extends _univerjs_core.Disposa
 		if (hasStyle) {
 			var _this$_univerInstance5;
 			const deleteMergeRanges = [];
-			const mergeData = (_this$_univerInstance5 = this._univerInstanceService.getUniverSheetInstance(unitId)) === null || _this$_univerInstance5 === void 0 || (_this$_univerInstance5 = _this$_univerInstance5.getSheetBySheetId(subUnitId)) === null || _this$_univerInstance5 === void 0 ? void 0 : _this$_univerInstance5.getMergeData();
+			const mergeData = (_this$_univerInstance5 = this._univerInstanceService.getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET)) === null || _this$_univerInstance5 === void 0 || (_this$_univerInstance5 = _this$_univerInstance5.getSheetBySheetId(subUnitId)) === null || _this$_univerInstance5 === void 0 ? void 0 : _this$_univerInstance5.getMergeData();
 			if (mergeData) mergeData.forEach((merge) => {
 				if (_univerjs_core.Rectangle.intersects(merge, targetRange)) deleteMergeRanges.push(merge);
 			});
@@ -17724,7 +17656,7 @@ let CalculateResultApplyController = class CalculateResultApplyController extend
 			const redoMutationsInfo = [];
 			for (let i = 0; i < unitIds.length; i++) {
 				const unitId = unitIds[i];
-				const workbook = this._univerInstanceService.getUniverSheetInstance(unitId);
+				const workbook = this._univerInstanceService.getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 				if (!workbook) continue;
 				const sheetData = unitData[unitId];
 				if (sheetData == null) continue;
@@ -17760,7 +17692,7 @@ let CalculateResultApplyController = class CalculateResultApplyController extend
 	* @returns
 	*/
 	_getMergedCellData(unitId, sheetId, cellData) {
-		const workbook = this._univerInstanceService.getUniverSheetInstance(unitId);
+		const workbook = this._univerInstanceService.getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 		const styles = workbook === null || workbook === void 0 ? void 0 : workbook.getStyles();
 		const worksheet = workbook === null || workbook === void 0 ? void 0 : workbook.getSheetBySheetId(sheetId);
 		const oldCellDataMatrix = worksheet === null || worksheet === void 0 ? void 0 : worksheet.getCellMatrix();
@@ -17851,14 +17783,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() {
@@ -18278,7 +18210,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;
@@ -18495,11 +18427,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],
@@ -19034,15 +18966,16 @@ ZebraCrossingCacheController = __decorate([
 
 //#endregion
 //#region src/models/range-protection-render.model.ts
-let RangeProtectionRenderModel = class RangeProtectionRenderModel {
+let RangeProtectionRenderModel = class RangeProtectionRenderModel extends _univerjs_core.Disposable {
 	constructor(_selectionProtectionRuleModel, _permissionService) {
+		super();
 		this._selectionProtectionRuleModel = _selectionProtectionRuleModel;
 		this._permissionService = _permissionService;
 		_defineProperty(this, "_cache", new _univerjs_core.LRUMap(1e4));
 		this._init();
 	}
 	_init() {
-		this._permissionService.permissionPointUpdate$.pipe((0, rxjs_operators.filter)((permission) => permission.type === _univerjs_protocol.UnitObject.SelectRange), (0, rxjs_operators.filter)((permission) => getAllRangePermissionPoint().some((F) => permission instanceof F)), (0, rxjs_operators.map)((permission) => permission)).subscribe((permission) => {
+		this.disposeWithMe(this._permissionService.permissionPointUpdate$.pipe((0, rxjs_operators.filter)((permission) => permission.type === _univerjs_protocol.UnitObject.SelectRange), (0, rxjs_operators.filter)((permission) => getAllRangePermissionPoint().some((F) => permission instanceof F)), (0, rxjs_operators.map)((permission) => permission)).subscribe((permission) => {
 			const ruleMap = this._selectionProtectionRuleModel.getSubunitRuleList(permission.unitId, permission.subUnitId);
 			for (const rule of ruleMap) if (rule.permissionId === permission.permissionId) rule.ranges.forEach((range) => {
 				_univerjs_core.Range.foreach(range, (row, col) => {
@@ -19050,8 +18983,8 @@ let RangeProtectionRenderModel = class RangeProtectionRenderModel {
 					this._cache.delete(key);
 				});
 			});
-		});
-		this._selectionProtectionRuleModel.ruleChange$.subscribe((info) => {
+		}));
+		this.disposeWithMe(this._selectionProtectionRuleModel.ruleChange$.subscribe((info) => {
 			info.rule.ranges.forEach((range) => {
 				_univerjs_core.Range.foreach(range, (row, col) => {
 					const key = this._createKey(info.unitId, info.subUnitId, row, col);
@@ -19067,7 +19000,7 @@ let RangeProtectionRenderModel = class RangeProtectionRenderModel {
 					});
 				});
 			}
-		});
+		}));
 	}
 	_createKey(unitId, subUnitId, row, col) {
 		return `${unitId}_${subUnitId}_${row}_${col}`;
@@ -19082,10 +19015,9 @@ let RangeProtectionRenderModel = class RangeProtectionRenderModel {
 		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({
@@ -19100,6 +19032,10 @@ let RangeProtectionRenderModel = class RangeProtectionRenderModel {
 	clear() {
 		this._cache.clear();
 	}
+	dispose() {
+		super.dispose();
+		this._cache.clear();
+	}
 };
 RangeProtectionRenderModel = __decorate([__decorateParam(0, (0, _univerjs_core.Inject)(RangeProtectionRuleModel)), __decorateParam(1, (0, _univerjs_core.Inject)(_univerjs_core.IPermissionService))], RangeProtectionRenderModel);
 
@@ -19237,11 +19173,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,
@@ -19389,7 +19325,7 @@ RangeProtectionCache = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets";
-var version = "1.0.0-alpha.7";
+var version = "1.0.0-beta.0";
 
 //#endregion
 //#region src/controllers/active-worksheet.controller.ts
@@ -19414,7 +19350,7 @@ let ActiveWorksheetController = class ActiveWorksheetController extends _univerj
 	_adjustActiveSheetOnHideSheet(mutation) {
 		var _workbook$getActiveSh;
 		const { unitId, subUnitId } = mutation.params;
-		const workbook = this._univerInstanceService.getUniverSheetInstance(unitId);
+		const workbook = this._univerInstanceService.getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 		if (!workbook) return;
 		if (((_workbook$getActiveSh = workbook.getActiveSheet()) === null || _workbook$getActiveSh === void 0 ? void 0 : _workbook$getActiveSh.getSheetId()) !== subUnitId) return;
 		const nextId = findTheNextUnhiddenSheet(workbook, workbook.getActiveSheetIndex());
@@ -19422,7 +19358,7 @@ let ActiveWorksheetController = class ActiveWorksheetController extends _univerj
 	}
 	_beforeAdjustActiveSheetOnRemoveSheet(mutation) {
 		const { unitId, subUnitId } = mutation.params;
-		const workbook = this._univerInstanceService.getUniverSheetInstance(unitId);
+		const workbook = this._univerInstanceService.getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 		if (!workbook) return;
 		const worksheet = workbook.getSheetBySheetId(subUnitId);
 		if (!worksheet) return;
@@ -19431,7 +19367,7 @@ let ActiveWorksheetController = class ActiveWorksheetController extends _univerj
 	_adjustActiveSheetOnRemoveSheet(mutation) {
 		if (this._previousSheetIndex === -1) return;
 		const { unitId } = mutation.params;
-		const workbook = this._univerInstanceService.getUniverSheetInstance(unitId);
+		const workbook = this._univerInstanceService.getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 		if (!workbook) return;
 		if (workbook.getActiveSheet().getSheetId() === mutation.params.subUnitId) {
 			const previousIndex = this._previousSheetIndex;
@@ -19496,7 +19432,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;
@@ -19538,7 +19473,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,
@@ -19776,10 +19711,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;
@@ -19898,7 +19833,7 @@ let NumfmtService = class NumfmtService extends _univerjs_core.Disposable {
 		this._logService = _logService;
 	}
 	getValue(unitId, subUnitId, row, col) {
-		const workbook = this._univerInstanceService.getUniverSheetInstance(unitId);
+		const workbook = this._univerInstanceService.getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 		if (!workbook) return;
 		const worksheet = workbook === null || workbook === void 0 ? void 0 : workbook.getSheetBySheetId(subUnitId);
 		if (!worksheet) return;
@@ -19911,7 +19846,7 @@ let NumfmtService = class NumfmtService extends _univerjs_core.Disposable {
 		return null;
 	}
 	deleteValues(unitId, subUnitId, values) {
-		const workbook = this._univerInstanceService.getUniverSheetInstance(unitId);
+		const workbook = this._univerInstanceService.getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 		if (!workbook) return;
 		const worksheet = workbook === null || workbook === void 0 ? void 0 : workbook.getSheetBySheetId(subUnitId);
 		if (!worksheet) return;
@@ -19928,7 +19863,7 @@ let NumfmtService = class NumfmtService extends _univerjs_core.Disposable {
 		});
 	}
 	setValues(unitId, subUnitId, values) {
-		const workbook = this._univerInstanceService.getUniverSheetInstance(unitId);
+		const workbook = this._univerInstanceService.getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 		if (!workbook) return;
 		const worksheet = workbook === null || workbook === void 0 ? void 0 : workbook.getSheetBySheetId(subUnitId);
 		if (!worksheet) return;
@@ -20444,7 +20379,7 @@ let RangeProtectionRefRangeService = class RangeProtectionRefRangeService extend
 				this._selectionProtectionRenderModel.clear();
 			}
 			if (mutationIdByRowCol.includes(command.id)) {
-				const workbook = this._univerInstanceService.getUniverSheetInstance(command.params.unitId);
+				const workbook = this._univerInstanceService.getUnit(command.params.unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 				if (!workbook) return;
 				const worksheet = workbook.getSheetBySheetId(command.params.subUnitId);
 				if (!worksheet) return;
@@ -21040,11 +20975,14 @@ const getPrimaryCellUp = (scopeRange, worksheet, currentPrimary, step = 1, isFin
 		startRow: next,
 		endRow: next
 	};
-	else if (isGoBack) return getPrimaryCellLeft(scopeRange, worksheet, {
-		...currentPrimary,
-		startRow: endRow,
-		endRow
-	}, step, isFindNext, false);
+	else if (isGoBack) {
+		const newPrimary = {
+			...currentPrimary,
+			startRow: endRow,
+			endRow
+		};
+		return getPrimaryCellLeft(scopeRange, worksheet, newPrimary, step, isFindNext, false);
+	}
 };
 const getPrimaryCellDown = (scopeRange, worksheet, currentPrimary, step = 1, isFindNext = true, isGoBack = true) => {
 	const { startRow, endRow } = _univerjs_core.Range.transformRange(scopeRange, worksheet);
@@ -21061,11 +20999,14 @@ const getPrimaryCellDown = (scopeRange, worksheet, currentPrimary, step = 1, isF
 		startRow: next,
 		endRow: next
 	};
-	else if (isGoBack) return getPrimaryCellRight(scopeRange, worksheet, {
-		...currentPrimary,
-		startRow,
-		endRow: startRow
-	}, step, isFindNext, false);
+	else if (isGoBack) {
+		const newPrimary = {
+			...currentPrimary,
+			startRow,
+			endRow: startRow
+		};
+		return getPrimaryCellRight(scopeRange, worksheet, newPrimary, step, isFindNext, false);
+	}
 };
 const getPrimaryCellLeft = (scopeRange, worksheet, currentPrimary, step = 1, isFindNext = true, isGoBack = true) => {
 	const { startColumn, endColumn } = _univerjs_core.Range.transformRange(scopeRange, worksheet);
@@ -21082,11 +21023,14 @@ const getPrimaryCellLeft = (scopeRange, worksheet, currentPrimary, step = 1, isF
 		startColumn: next,
 		endColumn: next
 	};
-	else if (isGoBack) return getPrimaryCellUp(scopeRange, worksheet, {
-		...currentPrimary,
-		startColumn: endColumn,
-		endColumn
-	}, step, isFindNext, false);
+	else if (isGoBack) {
+		const newPrimary = {
+			...currentPrimary,
+			startColumn: endColumn,
+			endColumn
+		};
+		return getPrimaryCellUp(scopeRange, worksheet, newPrimary, step, isFindNext, false);
+	}
 };
 const getPrimaryCellRight = (scopeRange, worksheet, currentPrimary, step = 1, isFindNext = true, isGoBack = true) => {
 	const { startColumn, endColumn } = _univerjs_core.Range.transformRange(scopeRange, worksheet);
@@ -21103,11 +21047,14 @@ const getPrimaryCellRight = (scopeRange, worksheet, currentPrimary, step = 1, is
 		endColumn: next,
 		startColumn: next
 	};
-	else if (isGoBack) return getPrimaryCellDown(scopeRange, worksheet, {
-		...currentPrimary,
-		startColumn,
-		endColumn: startColumn
-	}, step, isFindNext, false);
+	else if (isGoBack) {
+		const newPrimary = {
+			...currentPrimary,
+			startColumn,
+			endColumn: startColumn
+		};
+		return getPrimaryCellDown(scopeRange, worksheet, newPrimary, step, isFindNext, false);
+	}
 };
 function getCellAtRowCol$1(row, col, worksheet) {
 	let destRange = null;
@@ -21838,6 +21785,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;