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

package/lib/cjs/index.js

@@ -159,7 +159,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 +170,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 +183,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 +201,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 +209,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);
@@ -1681,7 +1681,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 +1723,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 +1754,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 +1770,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 +1789,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 +1957,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 +1968,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 +1982,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 +1993,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++) {
@@ -2343,7 +2343,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!");
@@ -2473,7 +2473,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 +2484,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 +2498,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 +2509,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++) {
@@ -3553,7 +3553,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 +3577,8 @@ var RangeMergeUtil = class {
 		return this;
 	}
 	merge() {
-		return findAllRectangle(createTopMatrixFromMatrix(this._matrix));
+		const topMatrix = createTopMatrixFromMatrix(this._matrix);
+		return findAllRectangle(topMatrix);
 	}
 };
 
@@ -4246,14 +4248,6 @@ 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);
@@ -4430,19 +4424,6 @@ let SheetsSelectionsService = class SheetsSelectionsService extends _univerjs_co
 	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 +5038,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);
@@ -5139,7 +5123,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, _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;
@@ -5414,7 +5398,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 +5495,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();
@@ -5774,7 +5758,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;
 		}
@@ -5882,7 +5866,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;
 		}
@@ -6455,10 +6439,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,9 +6460,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(_univerjs_core.ICommandService);
 		if ((0, _univerjs_core.sequenceExecute)([
@@ -6489,7 +6475,7 @@ const RemoveRowByRangeCommand = {
 			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({
@@ -6535,7 +6521,11 @@ const RemoveRowCommand = {
 		};
 		if (!await sheetInterceptorService.beforeCommandExecute({
 			id: RemoveRowCommand.id,
-			params: { range }
+			params: {
+				range,
+				unitId,
+				subUnitId
+			}
 		})) return false;
 		return commandService.syncExecuteCommand(RemoveRowByRangeCommand.id, {
 			range,
@@ -6567,9 +6557,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(_univerjs_core.ICommandService);
 		if ((0, _univerjs_core.sequenceExecute)([
@@ -6584,7 +6575,7 @@ const RemoveColByRangeCommand = {
 			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({
@@ -6631,7 +6622,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 +6632,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 +6674,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);
 	}
@@ -7260,7 +7255,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);
@@ -7290,7 +7285,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 +7293,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 +7484,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 +7521,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 +7562,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 +7607,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) => {
@@ -8092,7 +8087,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 +8103,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;
@@ -8301,7 +8296,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 +8310,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 = {
@@ -8744,7 +8739,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;
@@ -9444,7 +9439,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 +9488,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 +9553,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 +9769,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({
@@ -11565,7 +11561,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 +11628,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 +11673,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 +11714,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 +11760,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);
 		} }
@@ -11847,6 +11849,8 @@ let AutoFillService = class AutoFillService extends _univerjs_core.Disposable {
 		var _this$menu$find;
 		if (source.startColumn === selection.startColumn && source.startRow === selection.startRow && source.endColumn === selection.endColumn && source.endRow === selection.endRow) return false;
 		if (selection.endColumn < source.endColumn && selection.endColumn > source.startColumn) return this._commandService.executeCommand(AutoClearContentCommand.id, {
+			unitId,
+			subUnitId,
 			clearRange: {
 				startRow: selection.startRow,
 				endRow: selection.endRow,
@@ -11856,6 +11860,8 @@ let AutoFillService = class AutoFillService extends _univerjs_core.Disposable {
 			selectionRange: selection
 		});
 		if (selection.endRow < source.endRow && selection.endRow > source.startRow) return this._commandService.executeCommand(AutoClearContentCommand.id, {
+			unitId,
+			subUnitId,
 			clearRange: {
 				startRow: selection.endRow + 1,
 				endRow: source.endRow,
@@ -11885,8 +11891,8 @@ let AutoFillService = class AutoFillService extends _univerjs_core.Disposable {
 			target.startColumn = source.endColumn + 1;
 		} else return false;
 		this.direction = direction;
-		const autoFillSource = this._injector.invoke((accessor) => rangeToDiscreteRange(source, accessor));
-		const autoFillTarget = this._injector.invoke((accessor) => rangeToDiscreteRange(target, accessor));
+		const autoFillSource = this._injector.invoke((accessor) => rangeToDiscreteRange(source, accessor, unitId, subUnitId));
+		const autoFillTarget = this._injector.invoke((accessor) => rangeToDiscreteRange(target, accessor, unitId, subUnitId));
 		if (!autoFillSource || !autoFillTarget) return false;
 		this.autoFillLocation = {
 			source: autoFillSource,
@@ -12242,7 +12248,7 @@ const AutoClearContentCommand = {
 	id: "sheet.command.auto-clear-content",
 	type: _univerjs_core.CommandType.COMMAND,
 	handler: async (accessor, params) => {
-		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService));
+		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService), params);
 		if (!target) return false;
 		const commandService = accessor.get(_univerjs_core.ICommandService);
 		const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
@@ -12547,7 +12553,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));
@@ -13458,7 +13464,7 @@ const SetBorderCommand = {
 		const setRangeValuesMutationParams = {
 			unitId,
 			subUnitId,
-			cellValue: mr.getData()
+			cellValue: mr.clone()
 		};
 		const undoSetRangeValuesMutationParams = SetRangeValuesUndoMutationFactory(accessor, setRangeValuesMutationParams);
 		if (commandService.syncExecuteCommand(SetRangeValuesMutation.id, setRangeValuesMutationParams)) {
@@ -13905,7 +13911,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!");
@@ -13920,7 +13926,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;
@@ -14580,7 +14586,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
@@ -14590,7 +14596,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;
@@ -14995,7 +15001,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;
@@ -15062,7 +15068,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;
@@ -15138,7 +15144,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);
@@ -16375,7 +16381,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
@@ -16385,7 +16391,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;
@@ -17603,7 +17609,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);
 			});
@@ -17720,7 +17726,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;
@@ -17756,7 +17762,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();
@@ -19030,15 +19036,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) => {
@@ -19046,8 +19053,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);
@@ -19063,7 +19070,7 @@ let RangeProtectionRenderModel = class RangeProtectionRenderModel {
 					});
 				});
 			}
-		});
+		}));
 	}
 	_createKey(unitId, subUnitId, row, col) {
 		return `${unitId}_${subUnitId}_${row}_${col}`;
@@ -19096,6 +19103,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);
 
@@ -19385,7 +19396,7 @@ RangeProtectionCache = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets";
-var version = "1.0.0-alpha.6";
+var version = "1.0.0-alpha.8";
 
 //#endregion
 //#region src/controllers/active-worksheet.controller.ts
@@ -19410,7 +19421,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());
@@ -19418,7 +19429,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;
@@ -19427,7 +19438,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;
@@ -19894,7 +19905,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;
@@ -19907,7 +19918,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;
@@ -19924,7 +19935,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;
@@ -20440,7 +20451,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;
@@ -21036,11 +21047,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);
@@ -21057,11 +21071,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);
@@ -21078,11 +21095,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);
@@ -21099,11 +21119,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;