@univerjs/sheets 0.22.0 → 0.22.1-insiders.20260516-8900c44

package/lib/cjs/facade.js

@@ -6997,7 +6997,7 @@ let FWorkbook = class FWorkbook extends _univerjs_core_facade.FBaseInitialable {
 	create(name, rows, columns, options) {
 		var _options$sheet, _options$sheet2, _options$index;
 		const newSheet = (0, _univerjs_core.mergeWorksheetSnapshotWithDefault)(_univerjs_core.Tools.deepClone((_options$sheet = options === null || options === void 0 ? void 0 : options.sheet) !== null && _options$sheet !== void 0 ? _options$sheet : {}));
-		newSheet.name = this._workbook.uniqueSheetName(name);
+		newSheet.name = name;
 		newSheet.rowCount = rows;
 		newSheet.columnCount = columns;
 		newSheet.id = options === null || options === void 0 || (_options$sheet2 = options.sheet) === null || _options$sheet2 === void 0 ? void 0 : _options$sheet2.id;
@@ -7110,7 +7110,8 @@ let FWorkbook = class FWorkbook extends _univerjs_core_facade.FBaseInitialable {
 	insertSheet(sheetName, options) {
 		var _options$sheet3, _options$sheet4, _options$index2;
 		const newSheet = (0, _univerjs_core.mergeWorksheetSnapshotWithDefault)(_univerjs_core.Tools.deepClone((_options$sheet3 = options === null || options === void 0 ? void 0 : options.sheet) !== null && _options$sheet3 !== void 0 ? _options$sheet3 : {}));
-		newSheet.name = this._workbook.uniqueSheetName(sheetName);
+		if (sheetName !== void 0) newSheet.name = sheetName;
+		else delete newSheet.name;
 		newSheet.id = options === null || options === void 0 || (_options$sheet4 = options.sheet) === null || _options$sheet4 === void 0 ? void 0 : _options$sheet4.id;
 		const newSheetIndex = (_options$index2 = options === null || options === void 0 ? void 0 : options.index) !== null && _options$index2 !== void 0 ? _options$index2 : this._workbook.getSheets().length;
 		this._commandService.syncExecuteCommand(_univerjs_sheets.InsertSheetCommand.id, {

package/lib/cjs/index.js

@@ -235,9 +235,8 @@ let SheetInterceptorService = class SheetInterceptorService extends _univerjs_co
 		_defineProperty(this, "_afterCommandInterceptors", []);
 		_defineProperty(this, "_workbookDisposables", /* @__PURE__ */ new Map());
 		_defineProperty(this, "_worksheetDisposables", /* @__PURE__ */ new Map());
-		_defineProperty(this, "_interceptorsDirty", false);
 		_defineProperty(this, "_composedInterceptorByKey", /* @__PURE__ */ new Map());
-		_defineProperty(this, "_composedInterceptorsLengthByKey", /* @__PURE__ */ new Map());
+		_defineProperty(this, "_composedInterceptorVersion", 0);
 		_defineProperty(this, "writeCellInterceptor", new _univerjs_core.InterceptorManager({
 			BEFORE_CELL_EDIT,
 			AFTER_CELL_EDIT,
@@ -272,6 +271,7 @@ let SheetInterceptorService = class SheetInterceptorService extends _univerjs_co
 		this._worksheetDisposables.forEach((disposable) => disposable.dispose());
 		this._worksheetDisposables.clear();
 		this._interceptorsByName.clear();
+		this._composedInterceptorByKey.clear();
 	}
 	/**
 	* Add a listener function to a specific command to add affiliated mutations. It should be called in controllers.
@@ -437,7 +437,7 @@ let SheetInterceptorService = class SheetInterceptorService extends _univerjs_co
 			var _b$priority6, _a$priority6;
 			return ((_b$priority6 = b.priority) !== null && _b$priority6 !== void 0 ? _b$priority6 : 0) - ((_a$priority6 = a.priority) !== null && _a$priority6 !== void 0 ? _a$priority6 : 0);
 		});
-		this._interceptorsDirty = true;
+		this._invalidateComposedInterceptors();
 		if (key === INTERCEPTOR_POINT.CELL_CONTENT) {
 			const JOINED_EFFECT = _univerjs_core.InterceptorEffectEnum.Style | _univerjs_core.InterceptorEffectEnum.Value;
 			this._interceptorsByName.set(`${key}-${JOINED_EFFECT}`, sortedInterceptors);
@@ -449,27 +449,44 @@ let SheetInterceptorService = class SheetInterceptorService extends _univerjs_co
 				(0, _univerjs_core.remove)(this._interceptorsByName.get(`${key}-${JOINED_EFFECT}`), interceptor);
 				(0, _univerjs_core.remove)(this._interceptorsByName.get(`${key}-${_univerjs_core.InterceptorEffectEnum.Style}`), interceptor);
 				(0, _univerjs_core.remove)(this._interceptorsByName.get(`${key}-${_univerjs_core.InterceptorEffectEnum.Value}`), interceptor);
+				this._invalidateComposedInterceptors();
 			}));
 		} else {
 			this._interceptorsByName.set(key, sortedInterceptors);
-			return this.disposeWithMe((0, _univerjs_core.toDisposable)(() => (0, _univerjs_core.remove)(this._interceptorsByName.get(key), interceptor)));
+			return this.disposeWithMe((0, _univerjs_core.toDisposable)(() => {
+				(0, _univerjs_core.remove)(this._interceptorsByName.get(key), interceptor);
+				this._invalidateComposedInterceptors();
+			}));
 		}
 	}
 	fetchThroughInterceptors(name, effect, _key, filter) {
-		var _this$_interceptorsBy;
 		const byNamesKey = effect === void 0 ? name : `${name}-${effect}`;
 		const key = _key !== null && _key !== void 0 ? _key : byNamesKey;
 		let composed = this._composedInterceptorByKey.get(key);
-		const composedInterceptorsLength = this._composedInterceptorsLengthByKey.get(key) || 0;
-		if (!composed || !this._interceptorsDirty || composedInterceptorsLength !== (((_this$_interceptorsBy = this._interceptorsByName.get(byNamesKey)) === null || _this$_interceptorsBy === void 0 ? void 0 : _this$_interceptorsBy.length) || 0)) {
+		if (!composed) {
 			let interceptors = this._interceptorsByName.get(byNamesKey);
 			if (interceptors && filter) interceptors = interceptors.filter(filter);
 			composed = (0, _univerjs_core.composeInterceptors)(interceptors || []);
 			this._composedInterceptorByKey.set(key, composed);
-			this._composedInterceptorsLengthByKey.set(key, (interceptors === null || interceptors === void 0 ? void 0 : interceptors.length) || 0);
 		}
 		return composed;
 	}
+	_invalidateComposedInterceptors() {
+		this._composedInterceptorVersion += 1;
+		this._composedInterceptorByKey.clear();
+	}
+	_getCommonCellContentInterceptor(effect, cache) {
+		let composed = cache.get(effect);
+		if (!composed) {
+			composed = this.fetchThroughInterceptors(INTERCEPTOR_POINT.CELL_CONTENT, effect);
+			cache.set(effect, composed);
+		}
+		return composed;
+	}
+	_getCommonRowFilteredInterceptor(cache) {
+		if (!cache.interceptor) cache.interceptor = this.fetchThroughInterceptors(INTERCEPTOR_POINT.ROW_FILTERED);
+		return cache.interceptor;
+	}
 	_interceptWorkbook(workbook) {
 		const disposables = new _univerjs_core.DisposableCollection();
 		const unitId = workbook.getUnitId();
@@ -478,10 +495,14 @@ let SheetInterceptorService = class SheetInterceptorService extends _univerjs_co
 			const subUnitId = worksheet.getSheetId();
 			worksheet.__interceptViewModel((viewModel) => {
 				const sheetDisposables = new _univerjs_core.DisposableCollection();
+				const commonCellContentInterceptors = /* @__PURE__ */ new Map();
+				const commonRowFilteredInterceptor = { interceptor: null };
+				let commonCellContentInterceptorsVersion = -1;
+				let commonRowFilteredInterceptorVersion = -1;
 				sheetInterceptorService._worksheetDisposables.set(getWorksheetDisposableID(unitId, worksheet), sheetDisposables);
 				sheetDisposables.add(viewModel.registerCellContentInterceptor({ getCell(row, col, effect, key, filter) {
 					const rawData = worksheet.getCellRaw(row, col);
-					return sheetInterceptorService.fetchThroughInterceptors(INTERCEPTOR_POINT.CELL_CONTENT, effect, key, filter)(rawData, {
+					const context = {
 						unitId,
 						subUnitId,
 						row,
@@ -489,10 +510,22 @@ let SheetInterceptorService = class SheetInterceptorService extends _univerjs_co
 						worksheet,
 						workbook,
 						rawData
-					});
+					};
+					if (key === void 0 && filter === void 0) {
+						if (commonCellContentInterceptorsVersion !== sheetInterceptorService._composedInterceptorVersion) {
+							commonCellContentInterceptors.clear();
+							commonCellContentInterceptorsVersion = sheetInterceptorService._composedInterceptorVersion;
+						}
+						return sheetInterceptorService._getCommonCellContentInterceptor(effect, commonCellContentInterceptors)(rawData, context);
+					}
+					return sheetInterceptorService.fetchThroughInterceptors(INTERCEPTOR_POINT.CELL_CONTENT, effect, key, filter)(rawData, context);
 				} }));
 				sheetDisposables.add(viewModel.registerRowFilteredInterceptor({ getRowFiltered(row) {
-					return !!sheetInterceptorService.fetchThroughInterceptors(INTERCEPTOR_POINT.ROW_FILTERED)(false, {
+					if (commonRowFilteredInterceptorVersion !== sheetInterceptorService._composedInterceptorVersion) {
+						commonRowFilteredInterceptor.interceptor = null;
+						commonRowFilteredInterceptorVersion = sheetInterceptorService._composedInterceptorVersion;
+					}
+					return !!sheetInterceptorService._getCommonRowFilteredInterceptor(commonRowFilteredInterceptor)(false, {
 						unitId,
 						subUnitId,
 						row,
@@ -12793,12 +12826,13 @@ const InsertSheetCommand = {
 		let index = workbook.getSheets().length;
 		const sheet = params === null || params === void 0 ? void 0 : params.sheet;
 		const sheetId = sheet === null || sheet === void 0 ? void 0 : sheet.id;
+		const sheetName = sheet === null || sheet === void 0 ? void 0 : sheet.name;
 		const sheetConfig = (0, _univerjs_core.mergeWorksheetSnapshotWithDefault)(sheet || {});
 		if (params) {
 			var _params$index;
 			index = (_params$index = params.index) !== null && _params$index !== void 0 ? _params$index : index;
 			sheetConfig.id = sheetId || (0, _univerjs_core.generateRandomId)();
-			sheetConfig.name = (sheet === null || sheet === void 0 ? void 0 : sheet.name) || workbook.generateNewSheetName(`${localeService.t("sheets.tabs.sheet")}`);
+			sheetConfig.name = sheetName ? workbook.uniqueSheetName(sheetName) : workbook.generateNewSheetName(`${localeService.t("sheets.tabs.sheet")}`);
 		} else {
 			sheetConfig.id = (0, _univerjs_core.generateRandomId)();
 			sheetConfig.name = workbook.generateNewSheetName(`${localeService.t("sheets.tabs.sheet")}`);
@@ -18931,7 +18965,7 @@ let RangeProtectionCache = class RangeProtectionCache extends _univerjs_core.Dis
 		});
 	}
 	_initUpdateCellInfoCache() {
-		this._permissionService.permissionPointUpdate$.pipe((0, rxjs.filter)((permission) => permission.type === _univerjs_protocol.UnitObject.SelectRange), (0, rxjs.map)((permission) => permission)).subscribe((permission) => {
+		this.disposeWithMe(this._permissionService.permissionPointUpdate$.pipe((0, rxjs.filter)((permission) => permission.type === _univerjs_protocol.UnitObject.SelectRange), (0, rxjs.map)((permission) => permission)).subscribe((permission) => {
 			const { subUnitId, unitId, permissionId } = permission;
 			const ruleId = this._permissionIdCache.get(permissionId);
 			if (!ruleId) return;
@@ -18942,8 +18976,8 @@ let RangeProtectionCache = class RangeProtectionCache extends _univerjs_core.Dis
 				const { startRow, endRow, startColumn, endColumn } = range;
 				for (let i = startRow; i <= endRow; i++) for (let j = startColumn; j <= endColumn; j++) cellInfoMap.delete(`${i}-${j}`);
 			});
-		});
-		this._ruleModel.ruleChange$.subscribe((info) => {
+		}));
+		this.disposeWithMe(this._ruleModel.ruleChange$.subscribe((info) => {
 			const { unitId, subUnitId } = info;
 			const cellInfoMap = this._ensureCellInfoMap(unitId, subUnitId);
 			info.rule.ranges.forEach((range) => {
@@ -18959,10 +18993,10 @@ let RangeProtectionCache = class RangeProtectionCache extends _univerjs_core.Dis
 					});
 				});
 			}
-		});
+		}));
 	}
 	_initUpdateCellRuleCache() {
-		this._ruleModel.ruleChange$.subscribe((ruleChange) => {
+		this.disposeWithMe(this._ruleModel.ruleChange$.subscribe((ruleChange) => {
 			const { type } = ruleChange;
 			if (type === "add") this._addCellRuleCache(ruleChange);
 			else if (type === "delete") this._deleteCellRuleCache(ruleChange);
@@ -18973,7 +19007,7 @@ let RangeProtectionCache = class RangeProtectionCache extends _univerjs_core.Dis
 				});
 				this._addCellRuleCache(ruleChange);
 			}
-		});
+		}));
 	}
 	_ensureRuleMap(unitId, subUnitId) {
 		let subUnitMap = this._cellRuleCache.get(unitId);
@@ -19106,7 +19140,7 @@ let RangeProtectionCache = class RangeProtectionCache extends _univerjs_core.Dis
 		});
 	}
 	_initUpdateRowColInfoCache() {
-		this._permissionService.permissionPointUpdate$.pipe((0, rxjs.filter)((permission) => permission.type === _univerjs_protocol.UnitObject.SelectRange), (0, rxjs.map)((permission) => permission)).subscribe({ next: (permission) => {
+		this.disposeWithMe(this._permissionService.permissionPointUpdate$.pipe((0, rxjs.filter)((permission) => permission.type === _univerjs_protocol.UnitObject.SelectRange), (0, rxjs.map)((permission) => permission)).subscribe({ next: (permission) => {
 			const { subUnitId, unitId, permissionId } = permission;
 			const ruleId = this._permissionIdCache.get(permissionId);
 			if (!ruleId) return;
@@ -19128,8 +19162,8 @@ let RangeProtectionCache = class RangeProtectionCache extends _univerjs_core.Dis
 					}
 				}
 			});
-		} });
-		this._ruleModel.ruleChange$.subscribe((info) => {
+		} }));
+		this.disposeWithMe(this._ruleModel.ruleChange$.subscribe((info) => {
 			if (info.type === "delete") {
 				const { unitId, subUnitId, rule } = info;
 				const rowInfoMap = this._ensureRowColInfoMap(unitId, subUnitId, "row");
@@ -19146,7 +19180,7 @@ let RangeProtectionCache = class RangeProtectionCache extends _univerjs_core.Dis
 					}
 				});
 			}
-		});
+		}));
 	}
 	getCellInfo(unitId, subUnitId, row, col) {
 		var _this$_cellRuleCache$;
@@ -19189,7 +19223,7 @@ RangeProtectionCache = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets";
-var version = "0.22.0";
+var version = "0.22.1-insiders.20260516-8900c44";
 
 //#endregion
 //#region src/controllers/active-worksheet.controller.ts

package/lib/es/facade.js

@@ -6996,7 +6996,7 @@ let FWorkbook = class FWorkbook extends FBaseInitialable {
 	create(name, rows, columns, options) {
 		var _options$sheet, _options$sheet2, _options$index;
 		const newSheet = mergeWorksheetSnapshotWithDefault(Tools.deepClone((_options$sheet = options === null || options === void 0 ? void 0 : options.sheet) !== null && _options$sheet !== void 0 ? _options$sheet : {}));
-		newSheet.name = this._workbook.uniqueSheetName(name);
+		newSheet.name = name;
 		newSheet.rowCount = rows;
 		newSheet.columnCount = columns;
 		newSheet.id = options === null || options === void 0 || (_options$sheet2 = options.sheet) === null || _options$sheet2 === void 0 ? void 0 : _options$sheet2.id;
@@ -7109,7 +7109,8 @@ let FWorkbook = class FWorkbook extends FBaseInitialable {
 	insertSheet(sheetName, options) {
 		var _options$sheet3, _options$sheet4, _options$index2;
 		const newSheet = mergeWorksheetSnapshotWithDefault(Tools.deepClone((_options$sheet3 = options === null || options === void 0 ? void 0 : options.sheet) !== null && _options$sheet3 !== void 0 ? _options$sheet3 : {}));
-		newSheet.name = this._workbook.uniqueSheetName(sheetName);
+		if (sheetName !== void 0) newSheet.name = sheetName;
+		else delete newSheet.name;
 		newSheet.id = options === null || options === void 0 || (_options$sheet4 = options.sheet) === null || _options$sheet4 === void 0 ? void 0 : _options$sheet4.id;
 		const newSheetIndex = (_options$index2 = options === null || options === void 0 ? void 0 : options.index) !== null && _options$index2 !== void 0 ? _options$index2 : this._workbook.getSheets().length;
 		this._commandService.syncExecuteCommand(InsertSheetCommand.id, {

package/lib/es/index.js

@@ -234,9 +234,8 @@ let SheetInterceptorService = class SheetInterceptorService extends Disposable {
 		_defineProperty(this, "_afterCommandInterceptors", []);
 		_defineProperty(this, "_workbookDisposables", /* @__PURE__ */ new Map());
 		_defineProperty(this, "_worksheetDisposables", /* @__PURE__ */ new Map());
-		_defineProperty(this, "_interceptorsDirty", false);
 		_defineProperty(this, "_composedInterceptorByKey", /* @__PURE__ */ new Map());
-		_defineProperty(this, "_composedInterceptorsLengthByKey", /* @__PURE__ */ new Map());
+		_defineProperty(this, "_composedInterceptorVersion", 0);
 		_defineProperty(this, "writeCellInterceptor", new InterceptorManager({
 			BEFORE_CELL_EDIT,
 			AFTER_CELL_EDIT,
@@ -271,6 +270,7 @@ let SheetInterceptorService = class SheetInterceptorService extends Disposable {
 		this._worksheetDisposables.forEach((disposable) => disposable.dispose());
 		this._worksheetDisposables.clear();
 		this._interceptorsByName.clear();
+		this._composedInterceptorByKey.clear();
 	}
 	/**
 	* Add a listener function to a specific command to add affiliated mutations. It should be called in controllers.
@@ -436,7 +436,7 @@ let SheetInterceptorService = class SheetInterceptorService extends Disposable {
 			var _b$priority6, _a$priority6;
 			return ((_b$priority6 = b.priority) !== null && _b$priority6 !== void 0 ? _b$priority6 : 0) - ((_a$priority6 = a.priority) !== null && _a$priority6 !== void 0 ? _a$priority6 : 0);
 		});
-		this._interceptorsDirty = true;
+		this._invalidateComposedInterceptors();
 		if (key === INTERCEPTOR_POINT.CELL_CONTENT) {
 			const JOINED_EFFECT = InterceptorEffectEnum.Style | InterceptorEffectEnum.Value;
 			this._interceptorsByName.set(`${key}-${JOINED_EFFECT}`, sortedInterceptors);
@@ -448,27 +448,44 @@ let SheetInterceptorService = class SheetInterceptorService extends Disposable {
 				remove(this._interceptorsByName.get(`${key}-${JOINED_EFFECT}`), interceptor);
 				remove(this._interceptorsByName.get(`${key}-${InterceptorEffectEnum.Style}`), interceptor);
 				remove(this._interceptorsByName.get(`${key}-${InterceptorEffectEnum.Value}`), interceptor);
+				this._invalidateComposedInterceptors();
 			}));
 		} else {
 			this._interceptorsByName.set(key, sortedInterceptors);
-			return this.disposeWithMe(toDisposable(() => remove(this._interceptorsByName.get(key), interceptor)));
+			return this.disposeWithMe(toDisposable(() => {
+				remove(this._interceptorsByName.get(key), interceptor);
+				this._invalidateComposedInterceptors();
+			}));
 		}
 	}
 	fetchThroughInterceptors(name, effect, _key, filter) {
-		var _this$_interceptorsBy;
 		const byNamesKey = effect === void 0 ? name : `${name}-${effect}`;
 		const key = _key !== null && _key !== void 0 ? _key : byNamesKey;
 		let composed = this._composedInterceptorByKey.get(key);
-		const composedInterceptorsLength = this._composedInterceptorsLengthByKey.get(key) || 0;
-		if (!composed || !this._interceptorsDirty || composedInterceptorsLength !== (((_this$_interceptorsBy = this._interceptorsByName.get(byNamesKey)) === null || _this$_interceptorsBy === void 0 ? void 0 : _this$_interceptorsBy.length) || 0)) {
+		if (!composed) {
 			let interceptors = this._interceptorsByName.get(byNamesKey);
 			if (interceptors && filter) interceptors = interceptors.filter(filter);
 			composed = composeInterceptors(interceptors || []);
 			this._composedInterceptorByKey.set(key, composed);
-			this._composedInterceptorsLengthByKey.set(key, (interceptors === null || interceptors === void 0 ? void 0 : interceptors.length) || 0);
 		}
 		return composed;
 	}
+	_invalidateComposedInterceptors() {
+		this._composedInterceptorVersion += 1;
+		this._composedInterceptorByKey.clear();
+	}
+	_getCommonCellContentInterceptor(effect, cache) {
+		let composed = cache.get(effect);
+		if (!composed) {
+			composed = this.fetchThroughInterceptors(INTERCEPTOR_POINT.CELL_CONTENT, effect);
+			cache.set(effect, composed);
+		}
+		return composed;
+	}
+	_getCommonRowFilteredInterceptor(cache) {
+		if (!cache.interceptor) cache.interceptor = this.fetchThroughInterceptors(INTERCEPTOR_POINT.ROW_FILTERED);
+		return cache.interceptor;
+	}
 	_interceptWorkbook(workbook) {
 		const disposables = new DisposableCollection();
 		const unitId = workbook.getUnitId();
@@ -477,10 +494,14 @@ let SheetInterceptorService = class SheetInterceptorService extends Disposable {
 			const subUnitId = worksheet.getSheetId();
 			worksheet.__interceptViewModel((viewModel) => {
 				const sheetDisposables = new DisposableCollection();
+				const commonCellContentInterceptors = /* @__PURE__ */ new Map();
+				const commonRowFilteredInterceptor = { interceptor: null };
+				let commonCellContentInterceptorsVersion = -1;
+				let commonRowFilteredInterceptorVersion = -1;
 				sheetInterceptorService._worksheetDisposables.set(getWorksheetDisposableID(unitId, worksheet), sheetDisposables);
 				sheetDisposables.add(viewModel.registerCellContentInterceptor({ getCell(row, col, effect, key, filter) {
 					const rawData = worksheet.getCellRaw(row, col);
-					return sheetInterceptorService.fetchThroughInterceptors(INTERCEPTOR_POINT.CELL_CONTENT, effect, key, filter)(rawData, {
+					const context = {
 						unitId,
 						subUnitId,
 						row,
@@ -488,10 +509,22 @@ let SheetInterceptorService = class SheetInterceptorService extends Disposable {
 						worksheet,
 						workbook,
 						rawData
-					});
+					};
+					if (key === void 0 && filter === void 0) {
+						if (commonCellContentInterceptorsVersion !== sheetInterceptorService._composedInterceptorVersion) {
+							commonCellContentInterceptors.clear();
+							commonCellContentInterceptorsVersion = sheetInterceptorService._composedInterceptorVersion;
+						}
+						return sheetInterceptorService._getCommonCellContentInterceptor(effect, commonCellContentInterceptors)(rawData, context);
+					}
+					return sheetInterceptorService.fetchThroughInterceptors(INTERCEPTOR_POINT.CELL_CONTENT, effect, key, filter)(rawData, context);
 				} }));
 				sheetDisposables.add(viewModel.registerRowFilteredInterceptor({ getRowFiltered(row) {
-					return !!sheetInterceptorService.fetchThroughInterceptors(INTERCEPTOR_POINT.ROW_FILTERED)(false, {
+					if (commonRowFilteredInterceptorVersion !== sheetInterceptorService._composedInterceptorVersion) {
+						commonRowFilteredInterceptor.interceptor = null;
+						commonRowFilteredInterceptorVersion = sheetInterceptorService._composedInterceptorVersion;
+					}
+					return !!sheetInterceptorService._getCommonRowFilteredInterceptor(commonRowFilteredInterceptor)(false, {
 						unitId,
 						subUnitId,
 						row,
@@ -12792,12 +12825,13 @@ const InsertSheetCommand = {
 		let index = workbook.getSheets().length;
 		const sheet = params === null || params === void 0 ? void 0 : params.sheet;
 		const sheetId = sheet === null || sheet === void 0 ? void 0 : sheet.id;
+		const sheetName = sheet === null || sheet === void 0 ? void 0 : sheet.name;
 		const sheetConfig = mergeWorksheetSnapshotWithDefault(sheet || {});
 		if (params) {
 			var _params$index;
 			index = (_params$index = params.index) !== null && _params$index !== void 0 ? _params$index : index;
 			sheetConfig.id = sheetId || generateRandomId();
-			sheetConfig.name = (sheet === null || sheet === void 0 ? void 0 : sheet.name) || workbook.generateNewSheetName(`${localeService.t("sheets.tabs.sheet")}`);
+			sheetConfig.name = sheetName ? workbook.uniqueSheetName(sheetName) : workbook.generateNewSheetName(`${localeService.t("sheets.tabs.sheet")}`);
 		} else {
 			sheetConfig.id = generateRandomId();
 			sheetConfig.name = workbook.generateNewSheetName(`${localeService.t("sheets.tabs.sheet")}`);
@@ -18930,7 +18964,7 @@ let RangeProtectionCache = class RangeProtectionCache extends Disposable {
 		});
 	}
 	_initUpdateCellInfoCache() {
-		this._permissionService.permissionPointUpdate$.pipe(filter((permission) => permission.type === UnitObject$1.SelectRange), map((permission) => permission)).subscribe((permission) => {
+		this.disposeWithMe(this._permissionService.permissionPointUpdate$.pipe(filter((permission) => permission.type === UnitObject$1.SelectRange), map((permission) => permission)).subscribe((permission) => {
 			const { subUnitId, unitId, permissionId } = permission;
 			const ruleId = this._permissionIdCache.get(permissionId);
 			if (!ruleId) return;
@@ -18941,8 +18975,8 @@ let RangeProtectionCache = class RangeProtectionCache extends Disposable {
 				const { startRow, endRow, startColumn, endColumn } = range;
 				for (let i = startRow; i <= endRow; i++) for (let j = startColumn; j <= endColumn; j++) cellInfoMap.delete(`${i}-${j}`);
 			});
-		});
-		this._ruleModel.ruleChange$.subscribe((info) => {
+		}));
+		this.disposeWithMe(this._ruleModel.ruleChange$.subscribe((info) => {
 			const { unitId, subUnitId } = info;
 			const cellInfoMap = this._ensureCellInfoMap(unitId, subUnitId);
 			info.rule.ranges.forEach((range) => {
@@ -18958,10 +18992,10 @@ let RangeProtectionCache = class RangeProtectionCache extends Disposable {
 					});
 				});
 			}
-		});
+		}));
 	}
 	_initUpdateCellRuleCache() {
-		this._ruleModel.ruleChange$.subscribe((ruleChange) => {
+		this.disposeWithMe(this._ruleModel.ruleChange$.subscribe((ruleChange) => {
 			const { type } = ruleChange;
 			if (type === "add") this._addCellRuleCache(ruleChange);
 			else if (type === "delete") this._deleteCellRuleCache(ruleChange);
@@ -18972,7 +19006,7 @@ let RangeProtectionCache = class RangeProtectionCache extends Disposable {
 				});
 				this._addCellRuleCache(ruleChange);
 			}
-		});
+		}));
 	}
 	_ensureRuleMap(unitId, subUnitId) {
 		let subUnitMap = this._cellRuleCache.get(unitId);
@@ -19105,7 +19139,7 @@ let RangeProtectionCache = class RangeProtectionCache extends Disposable {
 		});
 	}
 	_initUpdateRowColInfoCache() {
-		this._permissionService.permissionPointUpdate$.pipe(filter((permission) => permission.type === UnitObject$1.SelectRange), map((permission) => permission)).subscribe({ next: (permission) => {
+		this.disposeWithMe(this._permissionService.permissionPointUpdate$.pipe(filter((permission) => permission.type === UnitObject$1.SelectRange), map((permission) => permission)).subscribe({ next: (permission) => {
 			const { subUnitId, unitId, permissionId } = permission;
 			const ruleId = this._permissionIdCache.get(permissionId);
 			if (!ruleId) return;
@@ -19127,8 +19161,8 @@ let RangeProtectionCache = class RangeProtectionCache extends Disposable {
 					}
 				}
 			});
-		} });
-		this._ruleModel.ruleChange$.subscribe((info) => {
+		} }));
+		this.disposeWithMe(this._ruleModel.ruleChange$.subscribe((info) => {
 			if (info.type === "delete") {
 				const { unitId, subUnitId, rule } = info;
 				const rowInfoMap = this._ensureRowColInfoMap(unitId, subUnitId, "row");
@@ -19145,7 +19179,7 @@ let RangeProtectionCache = class RangeProtectionCache extends Disposable {
 					}
 				});
 			}
-		});
+		}));
 	}
 	getCellInfo(unitId, subUnitId, row, col) {
 		var _this$_cellRuleCache$;
@@ -19188,7 +19222,7 @@ RangeProtectionCache = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets";
-var version = "0.22.0";
+var version = "0.22.1-insiders.20260516-8900c44";
 
 //#endregion
 //#region src/controllers/active-worksheet.controller.ts

package/lib/facade.js

@@ -6996,7 +6996,7 @@ let FWorkbook = class FWorkbook extends FBaseInitialable {
 	create(name, rows, columns, options) {
 		var _options$sheet, _options$sheet2, _options$index;
 		const newSheet = mergeWorksheetSnapshotWithDefault(Tools.deepClone((_options$sheet = options === null || options === void 0 ? void 0 : options.sheet) !== null && _options$sheet !== void 0 ? _options$sheet : {}));
-		newSheet.name = this._workbook.uniqueSheetName(name);
+		newSheet.name = name;
 		newSheet.rowCount = rows;
 		newSheet.columnCount = columns;
 		newSheet.id = options === null || options === void 0 || (_options$sheet2 = options.sheet) === null || _options$sheet2 === void 0 ? void 0 : _options$sheet2.id;
@@ -7109,7 +7109,8 @@ let FWorkbook = class FWorkbook extends FBaseInitialable {
 	insertSheet(sheetName, options) {
 		var _options$sheet3, _options$sheet4, _options$index2;
 		const newSheet = mergeWorksheetSnapshotWithDefault(Tools.deepClone((_options$sheet3 = options === null || options === void 0 ? void 0 : options.sheet) !== null && _options$sheet3 !== void 0 ? _options$sheet3 : {}));
-		newSheet.name = this._workbook.uniqueSheetName(sheetName);
+		if (sheetName !== void 0) newSheet.name = sheetName;
+		else delete newSheet.name;
 		newSheet.id = options === null || options === void 0 || (_options$sheet4 = options.sheet) === null || _options$sheet4 === void 0 ? void 0 : _options$sheet4.id;
 		const newSheetIndex = (_options$index2 = options === null || options === void 0 ? void 0 : options.index) !== null && _options$index2 !== void 0 ? _options$index2 : this._workbook.getSheets().length;
 		this._commandService.syncExecuteCommand(InsertSheetCommand.id, {