@univerjs/sheets 0.21.0 → 0.21.1

package/lib/cjs/index.js

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 let _univerjs_core = require("@univerjs/core");
 let rxjs = require("rxjs");
-let _univerjs_engine_render = require("@univerjs/engine-render");
 let _univerjs_engine_formula = require("@univerjs/engine-formula");
+let _univerjs_engine_render = require("@univerjs/engine-render");
 let _univerjs_protocol = require("@univerjs/protocol");
 let rxjs_operators = require("rxjs/operators");
 let _univerjs_rpc = require("@univerjs/rpc");
@@ -243,8 +243,8 @@ let SheetInterceptorService = class SheetInterceptorService extends _univerjs_co
 			AFTER_CELL_EDIT,
 			VALIDATE_CELL
 		}));
-		this.disposeWithMe(this._univerInstanceService.getTypeOfUnitAdded$(_univerjs_core.UniverInstanceType.UNIVER_SHEET).subscribe((workbook) => {
-			this._interceptWorkbook(workbook);
+		this.disposeWithMe(this._univerInstanceService.getTypeOfUnitAdded$(_univerjs_core.UniverInstanceType.UNIVER_SHEET).subscribe((event) => {
+			this._interceptWorkbook(event.unit);
 		}));
 		this.disposeWithMe(this._univerInstanceService.getTypeOfUnitDisposed$(_univerjs_core.UniverInstanceType.UNIVER_SHEET).subscribe((workbook) => this._disposeWorkbookInterceptor(workbook)));
 		this.intercept(INTERCEPTOR_POINT.CELL_CONTENT, {
@@ -2712,7 +2712,7 @@ const SetWorksheetActiveOperation = {
 	id: "sheet.operation.set-worksheet-active",
 	type: _univerjs_core.CommandType.OPERATION,
 	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 worksheets = workbook.getWorksheets();
 		for (const [, worksheet] of worksheets) if (worksheet.getSheetId() === params.subUnitId) {
@@ -3042,6 +3042,27 @@ function getSkeletonChangedEffectedRange(commandInfo, columnCount) {
 	}
 }
 
+//#endregion
+//#region src/basics/defined-name-utils.ts
+function validateDefinedName(name, options) {
+	if (name.length === 0) return "definedName.nameEmpty";
+	const { unitId, formulaOrRefString, univerInstanceService, definedNamesService, superTableService, functionService, id } = options;
+	/**
+	* The defined name can't be duplicate with existing defined names.
+	* If id is provided, it means we are updating an existing defined name. We should allow the name to be the same as itself.
+	*/
+	const existingDefinedName = definedNamesService.getValueByName(unitId, name);
+	if (existingDefinedName && (id === null || id === void 0 || id.length === 0 || existingDefinedName.id !== id)) return "definedName.nameDuplicate";
+	if (superTableService.hasTable(unitId, name)) return "definedName.nameDuplicate";
+	if (!_univerjs_core.Tools.isValidParameter(name) || (0, _univerjs_engine_formula.isReferenceStringWithEffectiveColumn)(name) || !_univerjs_core.Tools.isStartValidPosition(name) && !(0, _univerjs_engine_render.hasCJKText)(name.substring(0, 1))) return "definedName.nameInvalid";
+	const workbook = univerInstanceService.getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
+	if (!workbook) throw new Error(`Workbook not found for unitId: ${unitId}`);
+	if (workbook.getSheets().some((sheet) => sheet.getName() === name)) return "definedName.nameSheetConflict";
+	if (formulaOrRefString.length === 0) return "definedName.formulaOrRefStringEmpty";
+	if (functionService.hasExecutor(name.toUpperCase())) return "definedName.nameConflict";
+	return true;
+}
+
 //#endregion
 //#region src/basics/expand-range.ts
 function cellHasValue$1(cell) {
@@ -4440,19 +4461,18 @@ const ClearSelectionAllCommand = {
 	type: _univerjs_core.CommandType.COMMAND,
 	handler: (accessor, params) => {
 		var _selectionManagerServ;
-		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
-		const commandService = accessor.get(_univerjs_core.ICommandService);
+		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService), {
+			unitId: params === null || params === void 0 ? void 0 : params.unitId,
+			subUnitId: params === null || params === void 0 ? void 0 : params.subUnitId
+		});
+		if (!target) return false;
 		const selectionManagerService = accessor.get(SheetsSelectionsService);
-		const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
-		const sheetInterceptorService = accessor.get(SheetInterceptorService);
-		const workbook = univerInstanceService.getCurrentUnitForType(_univerjs_core.UniverInstanceType.UNIVER_SHEET);
-		if (!workbook) return false;
-		const unitId = (params === null || params === void 0 ? void 0 : params.unitId) || workbook.getUnitId();
-		const worksheet = workbook.getActiveSheet();
-		if (!worksheet) return false;
-		const subUnitId = (params === null || params === void 0 ? void 0 : params.subUnitId) || worksheet.getSheetId();
+		const { unitId, subUnitId } = target;
 		const selections = (params === null || params === void 0 ? void 0 : params.ranges) || ((_selectionManagerServ = selectionManagerService.getCurrentSelections()) === null || _selectionManagerServ === void 0 ? void 0 : _selectionManagerServ.map((s) => s.range));
 		if (!(selections === null || selections === void 0 ? void 0 : selections.length)) return false;
+		const commandService = accessor.get(_univerjs_core.ICommandService);
+		const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
+		const sheetInterceptorService = accessor.get(SheetInterceptorService);
 		const visibleRanges = getVisibleRanges(selections, accessor, unitId, subUnitId);
 		const sequenceExecuteList = [];
 		const sequenceExecuteUndoList = [];
@@ -4470,7 +4490,10 @@ const ClearSelectionAllCommand = {
 			id: SetRangeValuesMutation.id,
 			params: undoClearMutationParams
 		});
-		const intercepted = sheetInterceptorService.onCommandExecute({ id: ClearSelectionAllCommand.id });
+		const intercepted = sheetInterceptorService.onCommandExecute({
+			id: ClearSelectionAllCommand.id,
+			params
+		});
 		sequenceExecuteList.push(...intercepted.redos);
 		sequenceExecuteUndoList.unshift(...intercepted.undos);
 		if ((0, _univerjs_core.sequenceExecute)(sequenceExecuteList, commandService)) {
@@ -4495,19 +4518,18 @@ const ClearSelectionFormatCommand = {
 	type: _univerjs_core.CommandType.COMMAND,
 	handler: (accessor, params) => {
 		var _selectionManagerServ;
-		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
-		const commandService = accessor.get(_univerjs_core.ICommandService);
+		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService), {
+			unitId: params === null || params === void 0 ? void 0 : params.unitId,
+			subUnitId: params === null || params === void 0 ? void 0 : params.subUnitId
+		});
+		if (!target) return false;
 		const selectionManagerService = accessor.get(SheetsSelectionsService);
-		const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
-		const sheetInterceptorService = accessor.get(SheetInterceptorService);
-		const workbook = univerInstanceService.getCurrentUnitForType(_univerjs_core.UniverInstanceType.UNIVER_SHEET);
-		if (!workbook) return false;
-		const unitId = (params === null || params === void 0 ? void 0 : params.unitId) || workbook.getUnitId();
-		const worksheet = workbook.getActiveSheet();
-		if (!worksheet) return false;
-		const subUnitId = (params === null || params === void 0 ? void 0 : params.subUnitId) || worksheet.getSheetId();
+		const { unitId, subUnitId } = target;
 		const ranges = (params === null || params === void 0 ? void 0 : params.ranges) || ((_selectionManagerServ = selectionManagerService.getCurrentSelections()) === null || _selectionManagerServ === void 0 ? void 0 : _selectionManagerServ.map((s) => s.range));
 		if (!(ranges === null || ranges === void 0 ? void 0 : ranges.length)) return false;
+		const commandService = accessor.get(_univerjs_core.ICommandService);
+		const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
+		const sheetInterceptorService = accessor.get(SheetInterceptorService);
 		const visibleRanges = getVisibleRanges(ranges, accessor, unitId, subUnitId);
 		const sequenceExecuteList = [];
 		const sequenceExecuteUndoList = [];
@@ -4525,7 +4547,10 @@ const ClearSelectionFormatCommand = {
 			id: SetRangeValuesMutation.id,
 			params: undoClearMutationParams
 		});
-		const intercepted = sheetInterceptorService.onCommandExecute({ id: ClearSelectionFormatCommand.id });
+		const intercepted = sheetInterceptorService.onCommandExecute({
+			id: ClearSelectionFormatCommand.id,
+			params
+		});
 		sequenceExecuteList.push(...intercepted.redos);
 		sequenceExecuteUndoList.unshift(...intercepted.undos);
 		if ((0, _univerjs_core.sequenceExecute)(sequenceExecuteList, commandService)) {
@@ -4733,7 +4758,8 @@ let RefSelectionsService = class RefSelectionsService extends SheetsSelectionsSe
 		const aliveWorkbooks = this._instanceSrv.getAllUnitsForType(_univerjs_core.UniverInstanceType.UNIVER_SHEET);
 		aliveWorkbooks.forEach((workbook) => this._ensureWorkbookSelection(workbook.getUnitId()));
 		const workbooks$ = new rxjs.BehaviorSubject(aliveWorkbooks);
-		this.disposeWithMe(this._instanceSrv.getTypeOfUnitAdded$(_univerjs_core.UniverInstanceType.UNIVER_SHEET).subscribe((workbook) => {
+		this.disposeWithMe(this._instanceSrv.getTypeOfUnitAdded$(_univerjs_core.UniverInstanceType.UNIVER_SHEET).subscribe((event) => {
+			const { unit: workbook } = event;
 			this._ensureWorkbookSelection(workbook.getUnitId());
 			workbooks$.next([...workbooks$.getValue(), workbook]);
 		}));
@@ -6635,6 +6661,8 @@ let SheetSkeletonService = class SheetSkeletonService extends _univerjs_core.Dis
 		this._univerInstanceService = _univerInstanceService;
 		_defineProperty(this, "_sceneMap", /* @__PURE__ */ new Map());
 		_defineProperty(this, "_sheetSkeletonParamStore", /* @__PURE__ */ new Map());
+		_defineProperty(this, "_buildSkeleton$", new rxjs.Subject());
+		_defineProperty(this, "buildSkeleton$", this._buildSkeleton$.asObservable());
 		this._init();
 	}
 	dispose() {
@@ -6649,7 +6677,7 @@ let SheetSkeletonService = class SheetSkeletonService extends _univerjs_core.Dis
 		this._sheetSkeletonParamStore.delete(unitId);
 	}
 	_init() {
-		this.disposeWithMe(this._univerInstanceService.getTypeOfUnitAdded$(_univerjs_core.UniverInstanceType.UNIVER_SHEET).subscribe((workbook) => this._initWorkbookSkeleton(workbook)));
+		this.disposeWithMe(this._univerInstanceService.getTypeOfUnitAdded$(_univerjs_core.UniverInstanceType.UNIVER_SHEET).subscribe((event) => this._initWorkbookSkeleton(event.unit)));
 		this.disposeWithMe(this._univerInstanceService.getTypeOfUnitDisposed$(_univerjs_core.UniverInstanceType.UNIVER_SHEET).subscribe((workbook) => this._disposeByUnitId(workbook.getUnitId())));
 	}
 	_initWorkbookSkeleton(workbook) {
@@ -6696,6 +6724,7 @@ let SheetSkeletonService = class SheetSkeletonService extends _univerjs_core.Dis
 		const unitId = worksheet.getUnitId();
 		const scene = this._sceneMap.get(unitId);
 		if (scene) spreadsheetSkeleton.setScene(scene);
+		this._buildSkeleton$.next(spreadsheetSkeleton);
 		return spreadsheetSkeleton;
 	}
 	setScene(unitId, scene) {
@@ -6704,6 +6733,11 @@ let SheetSkeletonService = class SheetSkeletonService extends _univerjs_core.Dis
 		if (!sheetSkeletonMap) return;
 		sheetSkeletonMap.forEach((skeletonParam) => skeletonParam.skeleton.setScene(scene));
 	}
+	getSkeletonsByUnitId(unitId) {
+		const sheetSkeletonMap = this._sheetSkeletonParamStore.get(unitId);
+		if (!sheetSkeletonMap) return [];
+		return Array.from(sheetSkeletonMap.values()).map((param) => param.skeleton);
+	}
 	getSkeleton(unitId, subUnitId) {
 		var _this$getSkeletonPara;
 		return (_this$getSkeletonPara = this.getSkeletonParam(unitId, subUnitId)) === null || _this$getSkeletonPara === void 0 ? void 0 : _this$getSkeletonPara.skeleton;
@@ -10691,25 +10725,20 @@ function isChnNumber$1(txt) {
 }
 function matchExtendNumber$1(txt) {
 	if (!txt) return { isExtendNumber: false };
-	const reg = /0|([1-9]+[0-9]*)/g;
-	const isExtendNumber = reg.test(txt);
-	if (isExtendNumber) {
-		const match = txt.match(reg);
-		if (match && match.length > 0) {
-			const matchTxt = match[match.length - 1];
-			const matchIndex = txt.lastIndexOf(matchTxt);
-			const beforeTxt = txt.substr(0, matchIndex);
-			const afterTxt = txt.substr(matchIndex + matchTxt.length);
-			return {
-				isExtendNumber: true,
-				matchTxt: Number(matchTxt),
-				beforeTxt,
-				afterTxt
-			};
-		}
-		return { isExtendNumber: false };
-	}
-	return { isExtendNumber };
+	const matches = [...txt.matchAll(/\d+/g)];
+	if (!matches.length) return { isExtendNumber: false };
+	const last = matches[matches.length - 1];
+	const rawMatchTxt = last[0];
+	const index = last.index;
+	const beforeTxt = txt.substring(0, index);
+	const afterTxt = txt.substring(index + rawMatchTxt.length);
+	return {
+		isExtendNumber: true,
+		rawMatchTxt,
+		matchNumber: Number(rawMatchTxt),
+		beforeTxt,
+		afterTxt
+	};
 }
 function isChnWeek1(txt) {
 	let isChnWeek1;
@@ -10742,13 +10771,19 @@ function getLenS$1(indexArr, rsd) {
 * equal diff
 */
 function isEqualDiff$1(arr) {
-	let diff = true;
-	const step = arr[1] - arr[0];
-	for (let i = 1; i < arr.length; i++) if (arr[i] - arr[i - 1] !== step) {
-		diff = false;
-		break;
+	if (arr.length < 3) return true;
+	let step = arr[1] - arr[0];
+	let changeStep = false;
+	for (let i = 2; i < arr.length; i++) {
+		const currentStep = arr[i] - arr[i - 1];
+		if (currentStep !== step) {
+			if (changeStep) return false;
+			if (currentStep !== -step) return false;
+			step = currentStep;
+			changeStep = true;
+		}
 	}
-	return diff;
+	return true;
 }
 function getDataIndex$1(csLen, asLen, indexArr) {
 	const obj = [];
@@ -10867,20 +10902,19 @@ function forecast(x, yArr, xArr, forward = true) {
 }
 function fillExtendNumber$1(data, len, step) {
 	const applyData = [];
-	const reg = /0|([1-9]+[0-9]*)/g;
+	const lastData = data[data.length - 1];
+	const matchResult = matchExtendNumber$1(`${lastData === null || lastData === void 0 ? void 0 : lastData.v}`);
+	if (!matchResult.isExtendNumber) return fillCopy$2(data, len);
+	const { matchNumber, rawMatchTxt, beforeTxt, afterTxt } = matchResult;
+	const width = rawMatchTxt.length;
 	for (let i = 1; i <= len; i++) {
-		var _data2;
 		const index = (i - 1) % data.length;
 		const d = _univerjs_core.Tools.deepClone(data[index]);
 		removeCellCustom(d);
-		const last = `${(_data2 = data[data.length - 1]) === null || _data2 === void 0 ? void 0 : _data2.v}`;
-		if (!last) continue;
-		const match = last === null || last === void 0 ? void 0 : last.match(reg);
-		const lastTxt = match === null || match === void 0 ? void 0 : match[match.length - 1];
-		if (!lastTxt) continue;
-		const num = Math.abs(Number(lastTxt) + step * i);
-		const lastIndex = last.lastIndexOf(lastTxt);
-		const valueTxt = last.substr(0, lastIndex) + num.toString() + last.substr(lastIndex + lastTxt.length);
+		if (!d || !d.v) continue;
+		let numStr = Math.abs(matchNumber + step * i).toString();
+		if (numStr.length < width) numStr = numStr.padStart(width, "0");
+		const valueTxt = `${beforeTxt}${numStr}${afterTxt}`;
 		if (d) {
 			d.v = valueTxt;
 			applyData.push(d);
@@ -10935,15 +10969,15 @@ function fillChnWeek$1(data, len, step, weekType = 0) {
 	const keyword = keywordMap[weekType];
 	const applyData = [];
 	for (let i = 1; i <= len; i++) {
-		var _data3;
+		var _data2;
 		const index = (i - 1) % data.length;
 		const d = _univerjs_core.Tools.deepClone(data[index]);
 		removeCellCustom(d);
 		let num = 0;
-		if (((_data3 = data[data.length - 1]) === null || _data3 === void 0 ? void 0 : _data3.v) === keyword[0]) num = 7 + step * i;
+		if (((_data2 = data[data.length - 1]) === null || _data2 === void 0 ? void 0 : _data2.v) === keyword[0]) num = 7 + step * i;
 		else {
-			var _data4;
-			const last = `${(_data4 = data[data.length - 1]) === null || _data4 === void 0 ? void 0 : _data4.v}`;
+			var _data3;
+			const last = `${(_data3 = data[data.length - 1]) === null || _data3 === void 0 ? void 0 : _data3.v}`;
 			if (last) num = chineseToNumber$1(last.substr(last.length - 1, 1)) + step * i;
 		}
 		if (num < 0) num = Math.ceil(Math.abs(num) / 7) * 7 + num;
@@ -10958,11 +10992,11 @@ function fillChnWeek$1(data, len, step, weekType = 0) {
 function fillChnNumber$1(data, len, step) {
 	const applyData = [];
 	for (let i = 1; i <= len; i++) {
-		var _data5;
+		var _data4;
 		const index = (i - 1) % data.length;
 		const d = _univerjs_core.Tools.deepClone(data[index]);
 		removeCellCustom(d);
-		const num = chineseToNumber$1(`${(_data5 = data[data.length - 1]) === null || _data5 === void 0 ? void 0 : _data5.v}`) + step * i;
+		const num = chineseToNumber$1(`${(_data4 = data[data.length - 1]) === null || _data4 === void 0 ? void 0 : _data4.v}`) + step * i;
 		let txt;
 		if (num <= 0) txt = "零";
 		else txt = numberToChinese(num);
@@ -11126,11 +11160,11 @@ function fillLoopSeries$1(data, len, step, series) {
 	const seriesLen = series.length;
 	const applyData = [];
 	for (let i = 1; i <= len; i++) {
-		var _data6;
+		var _data5;
 		const index = (i - 1) % data.length;
 		const d = _univerjs_core.Tools.deepClone(data[index]);
 		removeCellCustom(d);
-		const last = `${(_data6 = data[data.length - 1]) === null || _data6 === void 0 ? void 0 : _data6.v}`;
+		const last = `${(_data5 = data[data.length - 1]) === null || _data5 === void 0 ? void 0 : _data5.v}`;
 		let num = series.indexOf(last) + step * i;
 		if (num < 0) num += Math.abs(step) * seriesLen;
 		const rsd = num % seriesLen;
@@ -11415,9 +11449,13 @@ const AutoFillRules = {
 		isContinue: (prev, cur) => {
 			if (prev.type === AUTO_FILL_DATA_TYPE.EXTEND_NUMBER) {
 				var _prev$cellData;
-				const { beforeTxt, afterTxt } = matchExtendNumber(`${(_prev$cellData = prev.cellData) === null || _prev$cellData === void 0 ? void 0 : _prev$cellData.v}` || "");
-				const { beforeTxt: curBeforeTxt, afterTxt: curAfterTxt } = matchExtendNumber(`${cur === null || cur === void 0 ? void 0 : cur.v}` || "");
-				if (beforeTxt === curBeforeTxt && afterTxt === curAfterTxt) return true;
+				const prevMatch = matchExtendNumber(`${(_prev$cellData = prev.cellData) === null || _prev$cellData === void 0 ? void 0 : _prev$cellData.v}` || "");
+				const curMatch = matchExtendNumber(`${cur === null || cur === void 0 ? void 0 : cur.v}` || "");
+				if (prevMatch.isExtendNumber && curMatch.isExtendNumber) {
+					const { beforeTxt: prevBeforeTxt, afterTxt: prevAfterTxt } = prevMatch;
+					const { beforeTxt: curBeforeTxt, afterTxt: curAfterTxt } = curMatch;
+					if (prevBeforeTxt === curBeforeTxt && prevAfterTxt === curAfterTxt) return true;
+				}
 			}
 			return false;
 		},
@@ -11432,15 +11470,16 @@ const AutoFillRules = {
 			const dataNumArr = [];
 			for (let i = 0; i < data.length; i++) {
 				var _data$i;
-				const txt = `${(_data$i = data[i]) === null || _data$i === void 0 ? void 0 : _data$i.v}`;
-				txt && dataNumArr.push(Number(matchExtendNumber(txt).matchTxt));
+				const matchResult = matchExtendNumber(`${(_data$i = data[i]) === null || _data$i === void 0 ? void 0 : _data$i.v}`);
+				if (matchResult.isExtendNumber) dataNumArr.push(matchResult.matchNumber);
 			}
 			if (isReverse) {
 				data.reverse();
 				dataNumArr.reverse();
 			}
 			if (isEqualDiff(dataNumArr)) {
-				step = dataNumArr[1] - dataNumArr[0];
+				const dataLen = data.length;
+				step = dataNumArr[dataLen - 1] - dataNumArr[dataLen - 2];
 				return reverseIfNeed(fillExtendNumber(data, len, step), isReverse);
 			}
 			return fillCopy$1(data, len);
@@ -11495,7 +11534,10 @@ const AutoFillRules = {
 				dataNumArr.reverse();
 			}
 			if (isEqualDiff(dataNumArr)) {
-				if (hasWeek || dataNumArr[dataNumArr.length - 1] < 6 && dataNumArr[0] > 0 || dataNumArr[0] < 6 && dataNumArr[dataNumArr.length - 1] > 0) return reverseIfNeed(fillChnWeek(data, len, dataNumArr[1] - dataNumArr[0]), isReverse);
+				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);
+				}
 				return reverseIfNeed(fillChnNumber(data, len, dataNumArr[1] - dataNumArr[0]), isReverse);
 			}
 			return fillCopy$1(data, len);
@@ -11535,7 +11577,10 @@ const AutoFillRules = {
 				data.reverse();
 				dataNumArr.reverse();
 			}
-			if (isEqualDiff(dataNumArr)) return reverseIfNeed(fillChnWeek(data, len, dataNumArr[1] - dataNumArr[0], 1), isReverse);
+			if (isEqualDiff(dataNumArr)) {
+				const dataLen = data.length;
+				return reverseIfNeed(fillChnWeek(data, len, dataNumArr[dataLen - 1] - dataNumArr[dataLen - 2], 1), isReverse);
+			}
 			return fillCopy$1(data, len);
 		} }
 	},
@@ -11572,7 +11617,10 @@ const AutoFillRules = {
 				data.reverse();
 				dataNumArr.reverse();
 			}
-			if (isEqualDiff(dataNumArr)) return reverseIfNeed(fillChnWeek(data, len, dataNumArr[1] - dataNumArr[0], 2), isReverse);
+			if (isEqualDiff(dataNumArr)) {
+				const dataLen = data.length;
+				return reverseIfNeed(fillChnWeek(data, len, dataNumArr[dataLen - 1] - dataNumArr[dataLen - 2], 2), isReverse);
+			}
 			return fillCopy$1(data, len);
 		} }
 	},
@@ -11614,7 +11662,10 @@ const AutoFillRules = {
 				data.reverse();
 				dataNumArr.reverse();
 			}
-			if (isEqualDiff(dataNumArr)) return reverseIfNeed(fillLoopSeries(data, len, dataNumArr[1] - dataNumArr[0], series), isReverse);
+			if (isEqualDiff(dataNumArr)) {
+				const dataLen = data.length;
+				return reverseIfNeed(fillLoopSeries(data, len, dataNumArr[dataLen - 1] - dataNumArr[dataLen - 2], series), isReverse);
+			}
 			return fillCopy$1(data, len);
 		} }
 	},
@@ -12172,26 +12223,28 @@ const ClearSelectionContentCommand = {
 	type: _univerjs_core.CommandType.COMMAND,
 	handler: (accessor, params) => {
 		var _selectionManagerServ;
-		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
-		const commandService = accessor.get(_univerjs_core.ICommandService);
+		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService), {
+			unitId: params === null || params === void 0 ? void 0 : params.unitId,
+			subUnitId: params === null || params === void 0 ? void 0 : params.subUnitId
+		});
+		if (!target) return false;
 		const selectionManagerService = accessor.get(SheetsSelectionsService);
-		const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
-		const sheetInterceptorService = accessor.get(SheetInterceptorService);
-		const workbook = univerInstanceService.getCurrentUnitForType(_univerjs_core.UniverInstanceType.UNIVER_SHEET);
-		if (!workbook) return false;
-		const unitId = (params === null || params === void 0 ? void 0 : params.unitId) || workbook.getUnitId();
-		const worksheet = workbook.getActiveSheet();
-		if (!worksheet) return false;
-		const subUnitId = (params === null || params === void 0 ? void 0 : params.subUnitId) || worksheet.getSheetId();
+		const { unitId, subUnitId } = target;
 		const ranges = (params === null || params === void 0 ? void 0 : params.ranges) || ((_selectionManagerServ = selectionManagerService.getCurrentSelections()) === null || _selectionManagerServ === void 0 ? void 0 : _selectionManagerServ.map((s) => s.range));
 		if (!(ranges === null || ranges === void 0 ? void 0 : ranges.length)) return false;
+		const commandService = accessor.get(_univerjs_core.ICommandService);
+		const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
+		const sheetInterceptorService = accessor.get(SheetInterceptorService);
 		const clearMutationParams = {
 			subUnitId,
 			unitId,
 			cellValue: generateNullCellValue(getVisibleRanges(ranges, accessor, unitId, subUnitId))
 		};
 		const undoClearMutationParams = SetRangeValuesUndoMutationFactory(accessor, clearMutationParams);
-		const intercepted = sheetInterceptorService.onCommandExecute({ id: ClearSelectionContentCommand.id });
+		const intercepted = sheetInterceptorService.onCommandExecute({
+			id: ClearSelectionContentCommand.id,
+			params
+		});
 		const redos = [{
 			id: SetRangeValuesMutation.id,
 			params: clearMutationParams
@@ -13661,11 +13714,9 @@ function mergeSelections$1(ranges) {
 //#endregion
 //#region src/commands/commands/set-defined-name.command.ts
 /**
-* The command to update defined name
-*
+* The command to update defined name.
 * 1. The old defined name can be obtained through IDefinedNamesService, and does not need to be passed in from the outside, making the command input more concise
-
-2. Unlike InsertDefinedNameCommand, the old defined name needs to be deleted here at the same time. Because the command interception in UpdateDefinedNameController will add SetDefinedNameMutation or RemoveDefinedNameMutation, it results in that in DefinedNameController, only mutations can be listened to to update Function Description (commands cannot be listened to), so it is necessary to ensure that each mutation triggered by the command has completed all work.
+* 2. Unlike InsertDefinedNameCommand, the old defined name needs to be deleted here at the same time. Because the command interception in UpdateDefinedNameController will add SetDefinedNameMutation or RemoveDefinedNameMutation, it results in that in DefinedNameController, only mutations can be listened to to update Function Description (commands cannot be listened to), so it is necessary to ensure that each mutation triggered by the command has completed all work.
 */
 const SetDefinedNameCommand = {
 	id: "sheet.command.set-defined-name",
@@ -13684,10 +13735,10 @@ const SetDefinedNameCommand = {
 		});
 		const redos = [
 			...(_interceptorCommands$ = interceptorCommands.preRedos) !== null && _interceptorCommands$ !== void 0 ? _interceptorCommands$ : [],
-			{
+			...oldDefinedNameMutationParams ? [{
 				id: _univerjs_engine_formula.RemoveDefinedNameMutation.id,
 				params: oldDefinedNameMutationParams
-			},
+			}] : [],
 			{
 				id: _univerjs_engine_formula.SetDefinedNameMutation.id,
 				params: newDefinedNameMutationParams
@@ -13700,10 +13751,10 @@ const SetDefinedNameCommand = {
 				id: _univerjs_engine_formula.RemoveDefinedNameMutation.id,
 				params: newDefinedNameMutationParams
 			},
-			{
+			...oldDefinedNameMutationParams ? [{
 				id: _univerjs_engine_formula.SetDefinedNameMutation.id,
 				params: oldDefinedNameMutationParams
-			},
+			}] : [],
 			...interceptorCommands.undos
 		];
 		if ((0, _univerjs_core.sequenceExecute)(redos, commandService)) {
@@ -15964,10 +16015,8 @@ let WorksheetPermissionService = class WorksheetPermissionService extends _unive
 				});
 			});
 		};
-		this._univerInstanceService.getAllUnitsForType(_univerjs_core.UniverInstanceType.UNIVER_SHEET).forEach((workbook) => {
-			handleWorkbook(workbook);
-		});
-		this._univerInstanceService.getTypeOfUnitAdded$(_univerjs_core.UniverInstanceType.UNIVER_SHEET).pipe((0, rxjs_operators.takeUntil)(this.dispose$)).subscribe(handleWorkbook);
+		this._univerInstanceService.getAllUnitsForType(_univerjs_core.UniverInstanceType.UNIVER_SHEET).forEach((workbook) => handleWorkbook(workbook));
+		this._univerInstanceService.getTypeOfUnitAdded$(_univerjs_core.UniverInstanceType.UNIVER_SHEET).pipe((0, rxjs_operators.takeUntil)(this.dispose$)).subscribe((event) => handleWorkbook(event.unit));
 		this._univerInstanceService.getTypeOfUnitDisposed$(_univerjs_core.UniverInstanceType.UNIVER_SHEET).pipe((0, rxjs_operators.takeUntil)(this.dispose$)).subscribe((workbook) => {
 			workbook.getSheets().forEach((worksheet) => {
 				const unitId = workbook.getUnitId();
@@ -17804,7 +17853,7 @@ let SheetPermissionCheckController = class SheetPermissionCheckController extend
 						WorksheetEditPermission
 					],
 					rangeTypes: [RangeProtectionPermissionEditPoint]
-				}, params.ranges, params.unitId, params.subUnitId);
+				}, params === null || params === void 0 ? void 0 : params.ranges, params === null || params === void 0 ? void 0 : params.unitId, params === null || params === void 0 ? void 0 : params.subUnitId);
 				errorMsg = this._localeService.t("permission.dialog.editErr");
 				break;
 			case ClearSelectionContentCommand.id:
@@ -17813,7 +17862,7 @@ let SheetPermissionCheckController = class SheetPermissionCheckController extend
 					workbookTypes: [WorkbookEditablePermission],
 					worksheetTypes: [WorksheetSetCellValuePermission, WorksheetEditPermission],
 					rangeTypes: [RangeProtectionPermissionEditPoint]
-				}, params.ranges, params.unitId, params.subUnitId);
+				}, params === null || params === void 0 ? void 0 : params.ranges, params === null || params === void 0 ? void 0 : params.unitId, params === null || params === void 0 ? void 0 : params.subUnitId);
 				errorMsg = this._localeService.t("permission.dialog.editErr");
 				break;
 			case ClearSelectionFormatCommand.id:
@@ -17822,7 +17871,7 @@ let SheetPermissionCheckController = class SheetPermissionCheckController extend
 					workbookTypes: [WorkbookEditablePermission],
 					worksheetTypes: [WorksheetSetCellStylePermission, WorksheetEditPermission],
 					rangeTypes: [RangeProtectionPermissionEditPoint]
-				}, params.ranges, params.unitId, params.subUnitId);
+				}, params === null || params === void 0 ? void 0 : params.ranges, params === null || params === void 0 ? void 0 : params.unitId, params === null || params === void 0 ? void 0 : params.subUnitId);
 				errorMsg = this._localeService.t("permission.dialog.setStyleErr");
 				break;
 			case DeltaColumnWidthCommand.id:
@@ -18244,12 +18293,8 @@ let WorkbookPermissionService = class WorkbookPermissionService extends _univerj
 				this._permissionService.addPermissionPoint(instance);
 			});
 		};
-		this._univerInstanceService.getAllUnitsForType(_univerjs_core.UniverInstanceType.UNIVER_SHEET).forEach((workbook) => {
-			handleWorkbook(workbook);
-		});
-		this.disposeWithMe(this._univerInstanceService.getTypeOfUnitAdded$(_univerjs_core.UniverInstanceType.UNIVER_SHEET).subscribe((workbook) => {
-			handleWorkbook(workbook);
-		}));
+		this._univerInstanceService.getAllUnitsForType(_univerjs_core.UniverInstanceType.UNIVER_SHEET).forEach((workbook) => handleWorkbook(workbook));
+		this.disposeWithMe(this._univerInstanceService.getTypeOfUnitAdded$(_univerjs_core.UniverInstanceType.UNIVER_SHEET).subscribe((event) => handleWorkbook(event.unit)));
 		this.disposeWithMe(this._univerInstanceService.getTypeOfUnitDisposed$(_univerjs_core.UniverInstanceType.UNIVER_SHEET).subscribe((workbook) => {
 			const unitId = workbook.getUnitId();
 			workbook.getSheets().forEach((worksheet) => {
@@ -19088,7 +19133,7 @@ RangeProtectionCache = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets";
-var version = "0.21.0";
+var version = "0.21.1";
 
 //#endregion
 //#region src/controllers/active-worksheet.controller.ts
@@ -21491,4 +21536,5 @@ exports.rotateRange = rotateRange;
 exports.runRefRangeMutations = runRefRangeMutations;
 exports.setEndForRange = setEndForRange;
 exports.splitRangeText = splitRangeText;
-exports.transformCellsToRange = transformCellsToRange;
+exports.transformCellsToRange = transformCellsToRange;
+exports.validateDefinedName = validateDefinedName;