@univerjs/sheets 1.0.0-alpha.7 → 1.0.0-alpha.8

package/lib/es/index.js

@@ -1,4 +1,4 @@
-import { AUTO_HEIGHT_FOR_MERGED_CELLS, BORDER_KEYS, BORDER_STYLE_KEYS, BooleanNumber, BorderStyleTypes, BorderType, BuildTextUtils, COLOR_STYLE_KEYS, CellModeEnum, CellValueType, CommandType, CustomCommandExecutionError, DependentOn, Dimension, Direction, Disposable, DisposableCollection, DocumentDataModel, ErrorService, FontItalic, FontWeight, HorizontalAlign, IAuthzIoService, ICommandService, IConfigService, IConfirmService, IContextService, ILogService, IPermissionService, IResourceManagerService, IS_ROW_STYLE_PRECEDE_COLUMN_STYLE, IUndoRedoService, IUniverInstanceService, Inject, Injector, InterceptorEffectEnum, InterceptorManager, LRUMap, LocaleService, MAX_COLUMN_COUNT, MAX_ROW_COUNT, ObjectMatrix, Optional, PADDING_KEYS, PermissionStatus, Plugin, RANGE_TYPE, RTree, Range, Rectangle, RxDisposable, STYLE_KEYS, TEXT_DECORATION_KEYS, TEXT_ROTATION_KEYS, TextX, Tools, UniverInstanceType, UserManagerService, cellToRange, cloneWorksheetData, composeInterceptors, concatMatrixArray, createIdentifier, createInterceptorKey, createRowColIter, generateRandomId, getArrayLength, isBooleanString, isDefaultFormat, isFormulaId, isFormulaString, isICellData, isRealNum, isSafeNumeric, isTextFormat, mapObjectMatrix, merge, mergeIntervals, mergeOverrideWithDependencies, mergeWorksheetSnapshotWithDefault, moveMatrixArray, normalizeTextRuns, numfmt, queryObjectMatrix, regexp, registerDependencies, remove, selectionToArray, sequenceExecute, sliceMatrixArray, spliceArray, throttle, toDisposable, touchDependencies, willLoseNumericPrecision } from "@univerjs/core";
+import { AUTO_HEIGHT_FOR_MERGED_CELLS, BORDER_KEYS, BORDER_STYLE_KEYS, BooleanNumber, BorderStyleTypes, BorderType, BuildTextUtils, COLOR_STYLE_KEYS, CellModeEnum, CellValueType, CommandType, CustomCommandExecutionError, DependentOn, Dimension, Direction, Disposable, DisposableCollection, DocumentDataModel, ErrorService, FontItalic, FontWeight, HorizontalAlign, IAuthzIoService, ICommandService, IConfigService, IConfirmService, IContextService, ILogService, IPermissionService, IResourceManagerService, IS_ROW_STYLE_PRECEDE_COLUMN_STYLE, IUndoRedoService, IUniverInstanceService, Inject, Injector, InterceptorEffectEnum, InterceptorManager, LRUMap, LocaleService, MAX_COLUMN_COUNT, MAX_ROW_COUNT, ObjectMatrix, Optional, PADDING_KEYS, PermissionStatus, Plugin, RANGE_TYPE, RTree, Range, Rectangle, RxDisposable, STYLE_KEYS, TEXT_DECORATION_KEYS, TEXT_ROTATION_KEYS, TextX, Tools, UniverInstanceType, UserManagerService, cellToRange, cloneWorksheetData, composeInterceptors, concatMatrixArray, createIdentifier, createInterceptorKey, createRowColIter, generateRandomId, getArrayLength, getIntersectRange, isBooleanString, isDefaultFormat, isFormulaId, isFormulaString, isICellData, isRealNum, isSafeNumeric, isTextFormat, mapObjectMatrix, merge, mergeIntervals, mergeOverrideWithDependencies, mergeWorksheetSnapshotWithDefault, moveMatrixArray, normalizeTextRuns, numfmt, queryObjectMatrix, regexp, registerDependencies, remove, selectionToArray, sequenceExecute, sliceMatrixArray, spliceArray, throttle, toDisposable, touchDependencies, willLoseNumericPrecision } from "@univerjs/core";
 import { BehaviorSubject, Subject, distinctUntilChanged, filter, first, map, merge as merge$1, of, share, shareReplay, skip, switchMap, takeUntil } from "rxjs";
 import { IDefinedNamesService, LexerTreeBuilder, RemoveDefinedNameMutation, SetDefinedNameMutation, SetDefinedNameMutationFactory, SetFormulaCalculationResultMutation, UniverFormulaEnginePlugin, deserializeRangeWithSheet, deserializeRangeWithSheetWithCache, handleNumfmtInCell, isReferenceStringWithEffectiveColumn, operatorToken, sequenceNodeType, stripErrorMargin } from "@univerjs/engine-formula";
 import { SpreadsheetSkeleton, cjk, precisionTo } from "@univerjs/engine-render";
@@ -158,7 +158,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) {
@@ -169,7 +169,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];
@@ -182,14 +182,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,
@@ -200,7 +200,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);
@@ -208,7 +208,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);
@@ -1680,7 +1680,7 @@ const MoveRowsMutation = {
 	type: CommandType.MUTATION,
 	handler: (accessor, params) => {
 		const { unitId, subUnitId, sourceRange, targetRange } = params;
-		const univerSheet = accessor.get(IUniverInstanceService).getUniverSheetInstance(unitId);
+		const univerSheet = accessor.get(IUniverInstanceService).getUnit(unitId, 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!");
@@ -1722,7 +1722,7 @@ const MoveColsMutation = {
 	type: CommandType.MUTATION,
 	handler: (accessor, params) => {
 		const { unitId, subUnitId, sourceRange, targetRange } = params;
-		const univerSheet = accessor.get(IUniverInstanceService).getUniverSheetInstance(unitId);
+		const univerSheet = accessor.get(IUniverInstanceService).getUnit(unitId, 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!");
@@ -1753,7 +1753,7 @@ const RemoveRowMutation = {
 	id: "sheet.mutation.remove-rows",
 	type: CommandType.MUTATION,
 	handler: (accessor, params) => {
-		const universheet = accessor.get(IUniverInstanceService).getUniverSheetInstance(params.unitId);
+		const universheet = accessor.get(IUniverInstanceService).getUnit(params.unitId, UniverInstanceType.UNIVER_SHEET);
 		if (universheet == null) throw new Error("universheet is null error!");
 		const worksheet = universheet.getSheetBySheetId(params.subUnitId);
 		if (!worksheet) return false;
@@ -1769,7 +1769,7 @@ const RemoveRowMutation = {
 	}
 };
 const RemoveColMutationFactory = (accessor, params) => {
-	const universheet = accessor.get(IUniverInstanceService).getUniverSheetInstance(params.unitId);
+	const universheet = accessor.get(IUniverInstanceService).getUnit(params.unitId, 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!");
@@ -1788,7 +1788,7 @@ const RemoveColMutation = {
 	id: "sheet.mutation.remove-col",
 	type: CommandType.MUTATION,
 	handler: (accessor, params) => {
-		const universheet = accessor.get(IUniverInstanceService).getUniverSheetInstance(params.unitId);
+		const universheet = accessor.get(IUniverInstanceService).getUnit(params.unitId, UniverInstanceType.UNIVER_SHEET);
 		if (universheet == null) throw new Error("universheet is null error!");
 		const worksheet = universheet.getSheetBySheetId(params.subUnitId);
 		if (!worksheet) return false;
@@ -1956,7 +1956,7 @@ const SetColDataMutation = {
 //#endregion
 //#region src/commands/mutations/set-col-visible.mutation.ts
 const SetColHiddenUndoMutationFactory = (accessor, params) => {
-	if (accessor.get(IUniverInstanceService).getUniverSheetInstance(params.unitId) == null) throw new Error("universheet is null error!");
+	if (accessor.get(IUniverInstanceService).getUnit(params.unitId, UniverInstanceType.UNIVER_SHEET) == null) throw new Error("universheet is null error!");
 	return {
 		unitId: params.unitId,
 		subUnitId: params.subUnitId,
@@ -1967,7 +1967,7 @@ const SetColHiddenMutation = {
 	id: "sheet.mutation.set-col-hidden",
 	type: CommandType.MUTATION,
 	handler: (accessor, params) => {
-		const universheet = accessor.get(IUniverInstanceService).getUniverSheetInstance(params.unitId);
+		const universheet = accessor.get(IUniverInstanceService).getUnit(params.unitId, UniverInstanceType.UNIVER_SHEET);
 		if (!universheet) return false;
 		const manager = universheet.getSheetBySheetId(params.subUnitId).getColumnManager();
 		for (let i = 0; i < params.ranges.length; i++) {
@@ -1981,7 +1981,7 @@ const SetColHiddenMutation = {
 	}
 };
 const SetColVisibleUndoMutationFactory = (accessor, params) => {
-	if (accessor.get(IUniverInstanceService).getUniverSheetInstance(params.unitId) == null) throw new Error("universheet is null error!");
+	if (accessor.get(IUniverInstanceService).getUnit(params.unitId, UniverInstanceType.UNIVER_SHEET) == null) throw new Error("universheet is null error!");
 	return {
 		unitId: params.unitId,
 		subUnitId: params.subUnitId,
@@ -1992,7 +1992,7 @@ const SetColVisibleMutation = {
 	id: "sheet.mutation.set-col-visible",
 	type: CommandType.MUTATION,
 	handler: (accessor, params) => {
-		const universheet = accessor.get(IUniverInstanceService).getUniverSheetInstance(params.unitId);
+		const universheet = accessor.get(IUniverInstanceService).getUnit(params.unitId, UniverInstanceType.UNIVER_SHEET);
 		if (!universheet) return false;
 		const manager = universheet.getSheetBySheetId(params.subUnitId).getColumnManager();
 		for (let i = 0; i < params.ranges.length; i++) {
@@ -2342,7 +2342,7 @@ function setNull(value) {
 */
 const SetRangeValuesUndoMutationFactory = (accessor, params) => {
 	const { unitId, subUnitId, cellValue, isOverrideStyle } = params;
-	const workbook = accessor.get(IUniverInstanceService).getUniverSheetInstance(unitId);
+	const workbook = accessor.get(IUniverInstanceService).getUnit(unitId, 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!");
@@ -2472,7 +2472,7 @@ const SetRowDataMutation = {
 //#endregion
 //#region src/commands/mutations/set-row-visible.mutation.ts
 const SetRowVisibleUndoMutationFactory = (accessor, params) => {
-	if (accessor.get(IUniverInstanceService).getUniverSheetInstance(params.unitId) == null) throw new Error("universheet is null error!");
+	if (accessor.get(IUniverInstanceService).getUnit(params.unitId, UniverInstanceType.UNIVER_SHEET) == null) throw new Error("universheet is null error!");
 	return {
 		unitId: params.unitId,
 		subUnitId: params.subUnitId,
@@ -2483,7 +2483,7 @@ const SetRowVisibleMutation = {
 	id: "sheet.mutation.set-row-visible",
 	type: CommandType.MUTATION,
 	handler: (accessor, params) => {
-		const universheet = accessor.get(IUniverInstanceService).getUniverSheetInstance(params.unitId);
+		const universheet = accessor.get(IUniverInstanceService).getUnit(params.unitId, 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++) {
@@ -2497,7 +2497,7 @@ const SetRowVisibleMutation = {
 	}
 };
 const SetRowHiddenUndoMutationFactory = (accessor, params) => {
-	if (accessor.get(IUniverInstanceService).getUniverSheetInstance(params.unitId) == null) throw new Error("universheet is null error!");
+	if (accessor.get(IUniverInstanceService).getUnit(params.unitId, UniverInstanceType.UNIVER_SHEET) == null) throw new Error("universheet is null error!");
 	return {
 		unitId: params.unitId,
 		subUnitId: params.subUnitId,
@@ -2508,7 +2508,7 @@ const SetRowHiddenMutation = {
 	id: "sheet.mutation.set-row-hidden",
 	type: CommandType.MUTATION,
 	handler: (accessor, params) => {
-		const universheet = accessor.get(IUniverInstanceService).getUniverSheetInstance(params.unitId);
+		const universheet = accessor.get(IUniverInstanceService).getUnit(params.unitId, 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++) {
@@ -3552,7 +3552,8 @@ const findAllRectangle = (topMatrix) => {
 * @returns {IRange[]}
 */
 const rangeMerge = (ranges) => {
-	return findAllRectangle(createTopMatrixFromRanges(ranges));
+	const topMatrix = createTopMatrixFromRanges(ranges);
+	return findAllRectangle(topMatrix);
 };
 var RangeMergeUtil = class {
 	constructor() {
@@ -3575,7 +3576,8 @@ var RangeMergeUtil = class {
 		return this;
 	}
 	merge() {
-		return findAllRectangle(createTopMatrixFromMatrix(this._matrix));
+		const topMatrix = createTopMatrixFromMatrix(this._matrix);
+		return findAllRectangle(topMatrix);
 	}
 };
 
@@ -4245,14 +4247,6 @@ var WorkbookSelectionModel = class extends 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);
@@ -4429,19 +4423,6 @@ let SheetsSelectionsService = class SheetsSelectionsService extends RxDisposable
 	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 [];
@@ -5056,6 +5037,9 @@ RefSelectionsService = __decorate([__decorateParam(0, IUniverInstanceService)],
 
 //#endregion
 //#region src/commands/utils/selection-command-util.ts
+function hasOverlappingRanges(ranges) {
+	return ranges.some((range, index) => ranges.slice(index + 1).some((other) => Rectangle.simpleRangesIntersect(range, other)));
+}
 function getSelectionsService(accessor, fromCurrentSelection) {
 	const isInRefSelectionMode = accessor.get(IContextService).getContextValue(REF_SELECTIONS_ENABLED);
 	return accessor.get(isInRefSelectionMode && !fromCurrentSelection ? IRefSelectionsService : SheetsSelectionsService);
@@ -5138,7 +5122,7 @@ function _resolveMoveRangeContext(accessor, params) {
 	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;
 	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, 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;
@@ -5413,7 +5397,7 @@ function getInsertRangeMutations(accessor, params) {
 	const { unitId, subUnitId, range, shiftDimension, cellValue = {} } = params;
 	const instanceService = accessor.get(IUniverInstanceService);
 	const sheetInterceptorService = accessor.get(SheetInterceptorService);
-	const workbook = instanceService.getUniverSheetInstance(unitId);
+	const workbook = instanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET);
 	const worksheet = workbook === null || workbook === void 0 ? void 0 : workbook.getSheetBySheetId(subUnitId);
 	if (worksheet) {
 		const cellMatrix = worksheet.getCellMatrix();
@@ -5510,7 +5494,7 @@ function getRemoveRangeMutations(accessor, params) {
 	const { unitId, subUnitId, range, shiftDimension } = params;
 	const instanceService = accessor.get(IUniverInstanceService);
 	const sheetInterceptorService = accessor.get(SheetInterceptorService);
-	const workbook = instanceService.getUniverSheetInstance(unitId);
+	const workbook = instanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET);
 	const worksheet = workbook === null || workbook === void 0 ? void 0 : workbook.getSheetBySheetId(subUnitId);
 	if (worksheet) {
 		const cellMatrix = worksheet.getCellMatrix();
@@ -5773,7 +5757,7 @@ const InsertRangeMoveDownCommand = {
 		const sheetInterceptorService = accessor.get(SheetInterceptorService);
 		const errorService = accessor.get(ErrorService);
 		const localeService = accessor.get(LocaleService);
-		if (selectionManagerService.isOverlapping()) {
+		if (hasOverlappingRanges(selectionManagerService.getCurrentSelections().map(({ range }) => range))) {
 			errorService.emit(localeService.t("sheets.info.overlappingSelections"));
 			return false;
 		}
@@ -5881,7 +5865,7 @@ const InsertRangeMoveRightCommand = {
 		const sheetInterceptorService = accessor.get(SheetInterceptorService);
 		const errorService = accessor.get(ErrorService);
 		const localeService = accessor.get(LocaleService);
-		if (selectionManagerService.isOverlapping()) {
+		if (hasOverlappingRanges(selectionManagerService.getCurrentSelections().map(({ range }) => range))) {
 			errorService.emit(localeService.t("sheets.info.overlappingSelections"));
 			return false;
 		}
@@ -6454,10 +6438,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,
@@ -6474,9 +6459,10 @@ 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(ICommandService);
 		if (sequenceExecute([
@@ -6488,7 +6474,7 @@ const RemoveRowByRangeCommand = {
 			setSelection(range, workbook, worksheet, commandService);
 			const afterInterceptors = sheetInterceptorService.afterCommandExecute({
 				id: RemoveRowCommandId,
-				params: { range }
+				params: interceptorParams
 			});
 			sequenceExecute(afterInterceptors.redos, commandService);
 			accessor.get(IUndoRedoService).pushUndoRedo({
@@ -6534,7 +6520,11 @@ const RemoveRowCommand = {
 		};
 		if (!await sheetInterceptorService.beforeCommandExecute({
 			id: RemoveRowCommand.id,
-			params: { range }
+			params: {
+				range,
+				unitId,
+				subUnitId
+			}
 		})) return false;
 		return commandService.syncExecuteCommand(RemoveRowByRangeCommand.id, {
 			range,
@@ -6566,9 +6556,10 @@ 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(ICommandService);
 		if (sequenceExecute([
@@ -6583,7 +6574,7 @@ const RemoveColByRangeCommand = {
 			setSelection(range, workbook, worksheet, commandService);
 			const afterInterceptors = sheetInterceptorService.afterCommandExecute({
 				id: RemoveColCommandId,
-				params: { range }
+				params: interceptorParams
 			});
 			sequenceExecute(afterInterceptors.redos, commandService);
 			accessor.get(IUndoRedoService).pushUndoRedo({
@@ -6630,7 +6621,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(IUniverInstanceService));
+		const target = getSheetCommandTarget(accessor.get(IUniverInstanceService), params);
 		if (!target) return false;
 		const { worksheet, subUnitId, unitId } = target;
 		range = {
@@ -6640,7 +6631,11 @@ const RemoveColCommand = {
 		};
 		if (!await sheetInterceptorService.beforeCommandExecute({
 			id: RemoveColCommand.id,
-			params: { range }
+			params: {
+				range,
+				unitId,
+				subUnitId
+			}
 		})) return false;
 		return commandService.syncExecuteCommand(RemoveColByRangeCommand.id, {
 			range,
@@ -6678,7 +6673,7 @@ const RemoveSheetMutation = {
 	handler: (accessor, params) => {
 		const univerInstanceService = accessor.get(IUniverInstanceService);
 		const { subUnitId, unitId } = params;
-		const workbook = univerInstanceService.getUniverSheetInstance(unitId);
+		const workbook = univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET);
 		if (!workbook) return false;
 		return workbook.removeSheet(subUnitId);
 	}
@@ -7259,7 +7254,7 @@ const handleMoveRangeCommon = (param, targetRange) => {
 		matrix.setValue(row, col, 1);
 	});
 	const fromMatrix = new ObjectMatrix();
-	const loopFromRange = Rectangle.getIntersects(fromRange, targetRange);
+	const loopFromRange = getIntersectRange(fromRange, targetRange);
 	loopFromRange && Range.foreach(loopFromRange, (row, col) => {
 		if (matrix.getValue(row, col)) {
 			matrix.setValue(row, col, void 0);
@@ -7289,7 +7284,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 = Rectangle.getIntersects(targetRange, removeRange);
+			const intersectedRange = getIntersectRange(targetRange, removeRange);
 			if (intersectedRange) return {
 				step: 0,
 				length: -getLength(intersectedRange)
@@ -7297,7 +7292,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 = Rectangle.getIntersects(targetRange, removeRange);
+			const intersectedRange = getIntersectRange(targetRange, removeRange);
 			if (intersectedRange) {
 				const length = -getLength(intersectedRange);
 				return {
@@ -7488,7 +7483,7 @@ const handleInsertRangeMoveDownCommon = (param, targetRange) => {
 		endRow: Number.POSITIVE_INFINITY
 	};
 	const noMoveRanges = Rectangle.subtract(targetRange, bottomRange);
-	const targetMoveRange = Rectangle.getIntersects(bottomRange, targetRange);
+	const targetMoveRange = getIntersectRange(bottomRange, targetRange);
 	if (!targetMoveRange) return [targetRange];
 	const matrix = new ObjectMatrix();
 	noMoveRanges.forEach((noMoveRange) => {
@@ -7525,7 +7520,7 @@ const handleInsertRangeMoveRightCommon = (param, targetRange) => {
 		endColumn: Number.POSITIVE_INFINITY
 	};
 	const noMoveRanges = Rectangle.subtract(targetRange, bottomRange);
-	const targetMoveRange = Rectangle.getIntersects(bottomRange, targetRange);
+	const targetMoveRange = getIntersectRange(bottomRange, targetRange);
 	if (!targetMoveRange) return [targetRange];
 	const matrix = new ObjectMatrix();
 	noMoveRanges.forEach((noMoveRange) => {
@@ -7566,9 +7561,9 @@ const handleDeleteRangeMoveLeftCommon = (param, targetRange) => {
 		endColumn: Number.POSITIVE_INFINITY
 	};
 	const moveCount = range.endColumn - range.startColumn + 1;
-	const targetDeleteRange = Rectangle.getIntersects(range, targetRange);
+	const targetDeleteRange = getIntersectRange(range, targetRange);
 	const noMoveRanges = Rectangle.subtract(targetRange, rightRange);
-	const targetMoveRange = Rectangle.getIntersects(rightRange, targetRange);
+	const targetMoveRange = getIntersectRange(rightRange, targetRange);
 	if (!targetDeleteRange && !targetMoveRange) return [targetRange];
 	const matrix = new ObjectMatrix();
 	targetMoveRange && Range.foreach(targetMoveRange, (row, col) => {
@@ -7611,9 +7606,9 @@ const handleDeleteRangeMoveUpCommon = (param, targetRange) => {
 		endRow: Number.POSITIVE_INFINITY
 	};
 	const moveCount = range.endRow - range.startRow + 1;
-	const targetDeleteRange = Rectangle.getIntersects(range, targetRange);
+	const targetDeleteRange = getIntersectRange(range, targetRange);
 	const noMoveRanges = Rectangle.subtract(targetRange, bottomRange);
-	const targetMoveRange = Rectangle.getIntersects(bottomRange, targetRange);
+	const targetMoveRange = getIntersectRange(bottomRange, targetRange);
 	if (!targetDeleteRange && !targetMoveRange) return [targetRange];
 	const matrix = new ObjectMatrix();
 	targetMoveRange && Range.foreach(targetMoveRange, (row, col) => {
@@ -8091,7 +8086,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;
@@ -8107,7 +8102,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;
@@ -8300,7 +8295,7 @@ let RefRangeService = class RefRangeService extends 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 = {
@@ -8314,7 +8309,7 @@ let RefRangeService = class RefRangeService extends 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 = {
@@ -8743,7 +8738,7 @@ let MergeCellController = class MergeCellController extends Disposable {
 	}
 	_onRefRangeChange() {
 		const registerRefRange = (unitId, subUnitId) => {
-			const workbook = this._univerInstanceService.getUniverSheetInstance(unitId);
+			const workbook = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET);
 			if (!workbook) return;
 			const workSheet = workbook === null || workbook === void 0 ? void 0 : workbook.getSheetBySheetId(subUnitId);
 			if (!workSheet) return;
@@ -9443,7 +9438,7 @@ let MergeCellController = class MergeCellController extends Disposable {
 		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, UniverInstanceType.UNIVER_SHEET);
 				if (!workbook) return;
 				const worksheet = workbook.getSheetBySheetId(command.params.subUnitId);
 				if (!worksheet) return;
@@ -9492,7 +9487,7 @@ let MergeCellController = class MergeCellController extends Disposable {
 				});
 			}
 			if (mutationIdByRowCol$1.includes(command.id)) {
-				const workbook = this._univerInstanceService.getUniverSheetInstance(command.params.unitId);
+				const workbook = this._univerInstanceService.getUnit(command.params.unitId, UniverInstanceType.UNIVER_SHEET);
 				if (!workbook) return;
 				const worksheet = workbook.getSheetBySheetId(command.params.subUnitId);
 				if (!worksheet) return;
@@ -9557,7 +9552,7 @@ MergeCellController = __decorate([
 	__decorateParam(5, Inject(SheetsSelectionsService))
 ], MergeCellController);
 function getWorkbook(univerInstanceService, unitId) {
-	if (unitId) return univerInstanceService.getUniverSheetInstance(unitId);
+	if (unitId) return univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET);
 	return univerInstanceService.getCurrentUnitOfType(UniverInstanceType.UNIVER_SHEET);
 }
 function getWorksheet(workbook, subUnitId) {
@@ -9773,10 +9768,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({
@@ -11564,7 +11560,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) {
@@ -11630,9 +11627,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);
 		} }
@@ -11673,7 +11672,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);
 		} }
@@ -11713,7 +11713,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);
 		} }
@@ -11758,7 +11759,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);
 		} }
@@ -12550,7 +12552,7 @@ const InsertSheetMutation = {
 	handler: (accessor, params) => {
 		const univerInstanceService = accessor.get(IUniverInstanceService);
 		const { sheet, index, unitId, styles } = params;
-		const workbook = univerInstanceService.getUniverSheetInstance(unitId);
+		const workbook = univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET);
 		if (!workbook) return false;
 		if (styles) workbook.addStyles(styles);
 		return workbook.addWorksheet(sheet.id, index, cloneWorksheetData(sheet));
@@ -13461,7 +13463,7 @@ const SetBorderCommand = {
 		const setRangeValuesMutationParams = {
 			unitId,
 			subUnitId,
-			cellValue: mr.getData()
+			cellValue: mr.clone()
 		};
 		const undoSetRangeValuesMutationParams = SetRangeValuesUndoMutationFactory(accessor, setRangeValuesMutationParams);
 		if (commandService.syncExecuteCommand(SetRangeValuesMutation.id, setRangeValuesMutationParams)) {
@@ -13908,7 +13910,7 @@ const SetDefinedNameCommand = {
 //#endregion
 //#region src/commands/mutations/set-frozen.mutation.ts
 const SetFrozenMutationFactory = (accessor, params) => {
-	const universheet = accessor.get(IUniverInstanceService).getUniverSheetInstance(params.unitId);
+	const universheet = accessor.get(IUniverInstanceService).getUnit(params.unitId, 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!");
@@ -13923,7 +13925,7 @@ const SetFrozenMutation = {
 	id: "sheet.mutation.set-frozen",
 	type: CommandType.MUTATION,
 	handler: (accessor, params) => {
-		const universheet = accessor.get(IUniverInstanceService).getUniverSheetInstance(params.unitId);
+		const universheet = accessor.get(IUniverInstanceService).getUnit(params.unitId, UniverInstanceType.UNIVER_SHEET);
 		if (universheet == null) throw new Error("universheet is null error!");
 		const worksheet = universheet.getSheetBySheetId(params.subUnitId);
 		if (!worksheet) return false;
@@ -14583,7 +14585,7 @@ function mergeSelections(ranges) {
 //#endregion
 //#region src/commands/mutations/set-tab-color.mutation.ts
 const SetTabColorUndoMutationFactory = (accessor, params) => {
-	const oldTabColor = accessor.get(IUniverInstanceService).getUniverSheetInstance(params.unitId).getSheetBySheetId(params.subUnitId).getConfig().tabColor;
+	const oldTabColor = accessor.get(IUniverInstanceService).getUnit(params.unitId, UniverInstanceType.UNIVER_SHEET).getSheetBySheetId(params.subUnitId).getConfig().tabColor;
 	return {
 		...Tools.deepClone(params),
 		color: oldTabColor
@@ -14593,7 +14595,7 @@ const SetTabColorMutation = {
 	id: "sheet.mutation.set-tab-color",
 	type: CommandType.MUTATION,
 	handler: (accessor, params) => {
-		const workbook = accessor.get(IUniverInstanceService).getUniverSheetInstance(params.unitId);
+		const workbook = accessor.get(IUniverInstanceService).getUnit(params.unitId, UniverInstanceType.UNIVER_SHEET);
 		if (!workbook) return false;
 		const worksheet = workbook.getSheetBySheetId(params.subUnitId);
 		if (!worksheet) return false;
@@ -14998,7 +15000,7 @@ const SetWorksheetHideMutation = {
 	id: "sheet.mutation.set-worksheet-hidden",
 	type: CommandType.MUTATION,
 	handler: (accessor, params) => {
-		const universheet = accessor.get(IUniverInstanceService).getUniverSheetInstance(params.unitId);
+		const universheet = accessor.get(IUniverInstanceService).getUnit(params.unitId, UniverInstanceType.UNIVER_SHEET);
 		if (universheet == null) return false;
 		const worksheet = universheet.getSheetBySheetId(params.subUnitId);
 		if (!worksheet) return false;
@@ -15065,7 +15067,7 @@ const SetWorksheetNameMutation = {
 	id: "sheet.mutation.set-worksheet-name",
 	type: CommandType.MUTATION,
 	handler: (accessor, params) => {
-		const universheet = accessor.get(IUniverInstanceService).getUniverSheetInstance(params.unitId);
+		const universheet = accessor.get(IUniverInstanceService).getUnit(params.unitId, UniverInstanceType.UNIVER_SHEET);
 		if (universheet == null) return false;
 		const worksheet = universheet.getSheetBySheetId(params.subUnitId);
 		if (!worksheet) return false;
@@ -15141,7 +15143,7 @@ const SetWorksheetOrderMutation = {
 	id: "sheet.mutation.set-worksheet-order",
 	type: CommandType.MUTATION,
 	handler: (accessor, params) => {
-		const workbook = accessor.get(IUniverInstanceService).getUniverSheetInstance(params.unitId);
+		const workbook = accessor.get(IUniverInstanceService).getUnit(params.unitId, UniverInstanceType.UNIVER_SHEET);
 		if (!workbook) return false;
 		const config = workbook.getConfig();
 		config.sheetOrder.splice(params.fromOrder, 1);
@@ -16378,7 +16380,7 @@ const SetWorksheetProtectionCommand = {
 //#endregion
 //#region src/commands/mutations/set-worksheet-right-to-left.mutation.ts
 const SetWorksheetRightToLeftUndoMutationFactory = (accessor, params) => {
-	const oldState = accessor.get(IUniverInstanceService).getUniverSheetInstance(params.unitId).getSheetBySheetId(params.subUnitId).getConfig().rightToLeft;
+	const oldState = accessor.get(IUniverInstanceService).getUnit(params.unitId, UniverInstanceType.UNIVER_SHEET).getSheetBySheetId(params.subUnitId).getConfig().rightToLeft;
 	return {
 		...Tools.deepClone(params),
 		rightToLeft: oldState
@@ -16388,7 +16390,7 @@ const SetWorksheetRightToLeftMutation = {
 	id: "sheet.mutation.set-worksheet-right-to-left",
 	type: CommandType.MUTATION,
 	handler: (accessor, params) => {
-		const workbook = accessor.get(IUniverInstanceService).getUniverSheetInstance(params.unitId);
+		const workbook = accessor.get(IUniverInstanceService).getUnit(params.unitId, UniverInstanceType.UNIVER_SHEET);
 		if (!workbook) return false;
 		const worksheet = workbook.getSheetBySheetId(params.subUnitId);
 		if (!worksheet) return false;
@@ -17606,7 +17608,7 @@ let AutoFillController = class AutoFillController extends Disposable {
 		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, UniverInstanceType.UNIVER_SHEET)) === null || _this$_univerInstance5 === void 0 || (_this$_univerInstance5 = _this$_univerInstance5.getSheetBySheetId(subUnitId)) === null || _this$_univerInstance5 === void 0 ? void 0 : _this$_univerInstance5.getMergeData();
 			if (mergeData) mergeData.forEach((merge) => {
 				if (Rectangle.intersects(merge, targetRange)) deleteMergeRanges.push(merge);
 			});
@@ -17723,7 +17725,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, UniverInstanceType.UNIVER_SHEET);
 				if (!workbook) continue;
 				const sheetData = unitData[unitId];
 				if (sheetData == null) continue;
@@ -17759,7 +17761,7 @@ let CalculateResultApplyController = class CalculateResultApplyController extend
 	* @returns
 	*/
 	_getMergedCellData(unitId, sheetId, cellData) {
-		const workbook = this._univerInstanceService.getUniverSheetInstance(unitId);
+		const workbook = this._univerInstanceService.getUnit(unitId, 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();
@@ -19033,15 +19035,16 @@ ZebraCrossingCacheController = __decorate([
 
 //#endregion
 //#region src/models/range-protection-render.model.ts
-let RangeProtectionRenderModel = class RangeProtectionRenderModel {
+let RangeProtectionRenderModel = class RangeProtectionRenderModel extends Disposable {
 	constructor(_selectionProtectionRuleModel, _permissionService) {
+		super();
 		this._selectionProtectionRuleModel = _selectionProtectionRuleModel;
 		this._permissionService = _permissionService;
 		_defineProperty(this, "_cache", new LRUMap(1e4));
 		this._init();
 	}
 	_init() {
-		this._permissionService.permissionPointUpdate$.pipe(filter$1((permission) => permission.type === UnitObject.SelectRange), filter$1((permission) => getAllRangePermissionPoint().some((F) => permission instanceof F)), map$1((permission) => permission)).subscribe((permission) => {
+		this.disposeWithMe(this._permissionService.permissionPointUpdate$.pipe(filter$1((permission) => permission.type === UnitObject.SelectRange), filter$1((permission) => getAllRangePermissionPoint().some((F) => permission instanceof F)), map$1((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) => {
 				Range.foreach(range, (row, col) => {
@@ -19049,8 +19052,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) => {
 				Range.foreach(range, (row, col) => {
 					const key = this._createKey(info.unitId, info.subUnitId, row, col);
@@ -19066,7 +19069,7 @@ let RangeProtectionRenderModel = class RangeProtectionRenderModel {
 					});
 				});
 			}
-		});
+		}));
 	}
 	_createKey(unitId, subUnitId, row, col) {
 		return `${unitId}_${subUnitId}_${row}_${col}`;
@@ -19099,6 +19102,10 @@ let RangeProtectionRenderModel = class RangeProtectionRenderModel {
 	clear() {
 		this._cache.clear();
 	}
+	dispose() {
+		super.dispose();
+		this._cache.clear();
+	}
 };
 RangeProtectionRenderModel = __decorate([__decorateParam(0, Inject(RangeProtectionRuleModel)), __decorateParam(1, Inject(IPermissionService))], RangeProtectionRenderModel);
 
@@ -19388,7 +19395,7 @@ RangeProtectionCache = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets";
-var version = "1.0.0-alpha.7";
+var version = "1.0.0-alpha.8";
 
 //#endregion
 //#region src/controllers/active-worksheet.controller.ts
@@ -19413,7 +19420,7 @@ let ActiveWorksheetController = class ActiveWorksheetController extends Disposab
 	_adjustActiveSheetOnHideSheet(mutation) {
 		var _workbook$getActiveSh;
 		const { unitId, subUnitId } = mutation.params;
-		const workbook = this._univerInstanceService.getUniverSheetInstance(unitId);
+		const workbook = this._univerInstanceService.getUnit(unitId, 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());
@@ -19421,7 +19428,7 @@ let ActiveWorksheetController = class ActiveWorksheetController extends Disposab
 	}
 	_beforeAdjustActiveSheetOnRemoveSheet(mutation) {
 		const { unitId, subUnitId } = mutation.params;
-		const workbook = this._univerInstanceService.getUniverSheetInstance(unitId);
+		const workbook = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET);
 		if (!workbook) return;
 		const worksheet = workbook.getSheetBySheetId(subUnitId);
 		if (!worksheet) return;
@@ -19430,7 +19437,7 @@ let ActiveWorksheetController = class ActiveWorksheetController extends Disposab
 	_adjustActiveSheetOnRemoveSheet(mutation) {
 		if (this._previousSheetIndex === -1) return;
 		const { unitId } = mutation.params;
-		const workbook = this._univerInstanceService.getUniverSheetInstance(unitId);
+		const workbook = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET);
 		if (!workbook) return;
 		if (workbook.getActiveSheet().getSheetId() === mutation.params.subUnitId) {
 			const previousIndex = this._previousSheetIndex;
@@ -19897,7 +19904,7 @@ let NumfmtService = class NumfmtService extends Disposable {
 		this._logService = _logService;
 	}
 	getValue(unitId, subUnitId, row, col) {
-		const workbook = this._univerInstanceService.getUniverSheetInstance(unitId);
+		const workbook = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET);
 		if (!workbook) return;
 		const worksheet = workbook === null || workbook === void 0 ? void 0 : workbook.getSheetBySheetId(subUnitId);
 		if (!worksheet) return;
@@ -19910,7 +19917,7 @@ let NumfmtService = class NumfmtService extends Disposable {
 		return null;
 	}
 	deleteValues(unitId, subUnitId, values) {
-		const workbook = this._univerInstanceService.getUniverSheetInstance(unitId);
+		const workbook = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET);
 		if (!workbook) return;
 		const worksheet = workbook === null || workbook === void 0 ? void 0 : workbook.getSheetBySheetId(subUnitId);
 		if (!worksheet) return;
@@ -19927,7 +19934,7 @@ let NumfmtService = class NumfmtService extends Disposable {
 		});
 	}
 	setValues(unitId, subUnitId, values) {
-		const workbook = this._univerInstanceService.getUniverSheetInstance(unitId);
+		const workbook = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET);
 		if (!workbook) return;
 		const worksheet = workbook === null || workbook === void 0 ? void 0 : workbook.getSheetBySheetId(subUnitId);
 		if (!worksheet) return;
@@ -20443,7 +20450,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, UniverInstanceType.UNIVER_SHEET);
 				if (!workbook) return;
 				const worksheet = workbook.getSheetBySheetId(command.params.subUnitId);
 				if (!worksheet) return;
@@ -21039,11 +21046,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 } = Range.transformRange(scopeRange, worksheet);
@@ -21060,11 +21070,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 } = Range.transformRange(scopeRange, worksheet);
@@ -21081,11 +21094,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 } = Range.transformRange(scopeRange, worksheet);
@@ -21102,11 +21118,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;