@univerjs/sheets 1.0.0-rc.0 → 1.0.1

package/lib/cjs/index.js

@@ -119,6 +119,8 @@ function extractBooleanValue(value) {
 function setNull(value) {
 	if (value == null) return null;
 	if (value.f === void 0) value.f = null;
+	if (value.ft === void 0) value.ft = null;
+	if (value.fd === void 0) value.fd = null;
 	if (value.si === void 0) value.si = null;
 	if (value.p === void 0) value.p = null;
 	if (value.v === void 0) value.v = null;
@@ -217,7 +219,7 @@ const RangeThemeInterceptorId = "sheet.interceptor.range-theme-id";
 const IgnoreRangeThemeInterceptorKey = "sheet.interceptor.ignore-range-theme";
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -228,7 +230,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -241,14 +243,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.149.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.140.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -259,7 +261,7 @@ function _defineProperty(e, r, t) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorateParam.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -267,7 +269,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.149.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);
@@ -1710,7 +1712,8 @@ const MoveRowsMutation = {
 		const fromRow = sourceRange.startRow;
 		const count = sourceRange.endRow - sourceRange.startRow + 1;
 		const toRow = targetRange.startRow;
-		(0, _univerjs_core.moveMatrixArray)(fromRow, count, toRow, worksheet.getRowManager().getRowData());
+		const rowWrapper = worksheet.getRowManager().getRowData();
+		(0, _univerjs_core.moveMatrixArray)(fromRow, count, toRow, rowWrapper);
 		worksheet.getCellMatrix().moveRows(fromRow, count, toRow);
 		return true;
 	}
@@ -1752,7 +1755,8 @@ const MoveColsMutation = {
 		const fromCol = sourceRange.startColumn;
 		const count = sourceRange.endColumn - sourceRange.startColumn + 1;
 		const toCol = targetRange.startColumn;
-		(0, _univerjs_core.moveMatrixArray)(fromCol, count, toCol, worksheet.getColumnManager().getColumnData());
+		const columnWrapper = worksheet.getColumnManager().getColumnData();
+		(0, _univerjs_core.moveMatrixArray)(fromCol, count, toCol, columnWrapper);
 		worksheet.getCellMatrix().moveColumns(fromCol, count, toCol);
 		return true;
 	}
@@ -1764,7 +1768,8 @@ const RemoveRowsUndoMutationFactory = (params, worksheet) => {
 	const rowWrapper = worksheet.getRowManager().getRowData();
 	const rowInfo = {};
 	const range = params.range;
-	const _rowInfo = (0, _univerjs_core.concatMatrixArray)(rowInfo, (0, _univerjs_core.sliceMatrixArray)(range.startRow, range.endRow, rowWrapper));
+	const slice = (0, _univerjs_core.sliceMatrixArray)(range.startRow, range.endRow, rowWrapper);
+	const _rowInfo = (0, _univerjs_core.concatMatrixArray)(rowInfo, slice);
 	return {
 		unitId: params.unitId,
 		subUnitId: params.subUnitId,
@@ -1799,7 +1804,8 @@ const RemoveColMutationFactory = (accessor, params) => {
 	const columnWrapper = worksheet.getColumnManager().getColumnData();
 	const colInfo = {};
 	const range = params.range;
-	const _colInfo = (0, _univerjs_core.concatMatrixArray)(colInfo, (0, _univerjs_core.sliceMatrixArray)(range.startColumn, range.endColumn, columnWrapper));
+	const slice = (0, _univerjs_core.sliceMatrixArray)(range.startColumn, range.endColumn, columnWrapper);
+	const _colInfo = (0, _univerjs_core.concatMatrixArray)(colInfo, slice);
 	return {
 		unitId: params.unitId,
 		subUnitId: params.subUnitId,
@@ -1946,7 +1952,8 @@ const SetColDataMutationFactory = (params, worksheet) => {
 	const manager = worksheet.getColumnManager();
 	for (const colIndex in columnData) {
 		const newCol = columnData[colIndex];
-		oldColData[colIndex] = getOldColumnData(manager.getColumn(Number(colIndex)), newCol);
+		const currentCol = manager.getColumn(Number(colIndex));
+		oldColData[colIndex] = getOldColumnData(currentCol, newCol);
 	}
 	return {
 		unitId,
@@ -1959,7 +1966,8 @@ const SetColDataMutation = {
 	type: _univerjs_core.CommandType.MUTATION,
 	handler: (accessor, params) => {
 		const { columnData } = params;
-		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService), params);
+		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
+		const target = getSheetCommandTarget(univerInstanceService, params);
 		if (!target) return false;
 		const { worksheet } = target;
 		const manager = worksheet.getColumnManager();
@@ -2303,6 +2311,34 @@ function mergeRichTextStyle(p, newStyle) {
 //#endregion
 //#region src/commands/mutations/set-range-values.mutation.ts
 /**
+* Read-only native value preparation for caller-owned atomic model staging. The resulting style IDs
+* must travel with the prepared cells; replay installs them and must not allocate replacement IDs.
+* This does not execute handlers, publish notifications, or own style garbage collection.
+*/
+function prepareSetRangeValuesMutation(cells, styles, params) {
+	const detachedStyles = new _univerjs_core.Styles(_univerjs_core.Tools.deepClone(styles.toJSON()));
+	const before = new _univerjs_core.ObjectMatrix();
+	const after = new _univerjs_core.ObjectMatrix();
+	new _univerjs_core.ObjectMatrix(_univerjs_core.Tools.deepClone(params.cellValue)).forValue((row, column, value) => {
+		const original = _univerjs_core.Tools.deepClone(cells.getValue(row, column) ?? null);
+		before.setValue(row, column, original);
+		const next = value ? mergeCellData(value, _univerjs_core.Tools.deepClone(original ?? {}), detachedStyles, !!params.isOverrideStyle) : null;
+		after.setValue(row, column, next && !_univerjs_core.Tools.isEmptyObject(next) ? next : null);
+	});
+	const addedStyles = {};
+	for (const [id, style] of Object.entries(detachedStyles.toJSON())) {
+		if (!style) continue;
+		const current = styles.get(id);
+		if (current && !_univerjs_core.Tools.diffValue(current, style)) throw new TypeError("Prepared style ID collides with an existing style.");
+		if (!current) addedStyles[id] = _univerjs_core.Tools.deepClone(style);
+	}
+	return {
+		before: before.getMatrix(),
+		after: after.getMatrix(),
+		styles: addedStyles
+	};
+}
+/**
 * Generate undo mutation of a `SetRangeValuesMutation`
 *
 * @param {IAccessor} accessor - injector accessor
@@ -2359,7 +2395,9 @@ const overwriteCellPropertiesSet = /* @__PURE__ */ new Set([
 	"si",
 	"custom",
 	"ref",
-	"xf"
+	"xf",
+	"ft",
+	"fd"
 ]);
 function mergeCellData(newValue, oldValue, styles, isOverrideStyle = false) {
 	const type = getCellType(styles, newValue, oldValue);
@@ -2370,9 +2408,15 @@ function mergeCellData(newValue, oldValue, styles, isOverrideStyle = false) {
 			updateCellProperty(oldValue, cellPropertyKey, propertyValue);
 		} else if (cellPropertyKey === "v") {
 			if (newValue.v !== void 0) oldValue.v = getCellValue(type, newValue);
-		} else if (cellPropertyKey === "s") if (isOverrideStyle) overrideStyle(styles, oldValue, newValue);
-		else handleStyle(styles, oldValue, newValue);
+		} else if (cellPropertyKey === "s") {
+			if (isOverrideStyle) overrideStyle(styles, oldValue, newValue);
+			else handleStyle(styles, oldValue, newValue);
+		}
 	});
+	if ((newValue.f === null || newValue.f === "") && !(0, _univerjs_core.isFormulaId)(newValue.si)) {
+		delete oldValue.ft;
+		delete oldValue.fd;
+	}
 	if (oldValue.v !== void 0) {
 		oldValue.t = type;
 		oldValue.v = getCellValue(type, oldValue);
@@ -2408,7 +2452,8 @@ const SetRowDataMutationFactory = (params, worksheet) => {
 	const manager = worksheet.getRowManager();
 	for (const rowIndex in rowData) {
 		const newRow = rowData[rowIndex];
-		oldRowData[rowIndex] = getOldRowData(manager.getRow(Number(rowIndex)), newRow);
+		const currentRow = manager.getRow(Number(rowIndex));
+		oldRowData[rowIndex] = getOldRowData(currentRow, newRow);
 	}
 	return {
 		unitId,
@@ -2421,7 +2466,8 @@ const SetRowDataMutation = {
 	type: _univerjs_core.CommandType.MUTATION,
 	handler: (accessor, params) => {
 		const { rowData } = params;
-		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService), params);
+		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
+		const target = getSheetCommandTarget(univerInstanceService, params);
 		if (!target) return false;
 		const { worksheet } = target;
 		const manager = worksheet.getRowManager();
@@ -2521,7 +2567,8 @@ const SetWorksheetColWidthMutation = {
 	id: "sheet.mutation.set-worksheet-col-width",
 	type: _univerjs_core.CommandType.MUTATION,
 	handler: (accessor, params) => {
-		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService), params);
+		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
+		const target = getSheetCommandTarget(univerInstanceService, params);
 		if (!target) return false;
 		const { worksheet } = target;
 		const manager = worksheet.getColumnManager();
@@ -2553,7 +2600,8 @@ const SetWorksheetColumnCountMutation = {
 	id: "sheet.mutation.set-worksheet-column-count",
 	type: _univerjs_core.CommandType.MUTATION,
 	handler: (accessor, params) => {
-		const target = getSheetMutationTarget(accessor.get(_univerjs_core.IUniverInstanceService), params);
+		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
+		const target = getSheetMutationTarget(univerInstanceService, params);
 		if (!target) return false;
 		target.worksheet.setColumnCount(params.columnCount);
 		return true;
@@ -2600,7 +2648,8 @@ const SetWorksheetRowCountMutation = {
 	id: "sheet.mutation.set-worksheet-row-count",
 	type: _univerjs_core.CommandType.MUTATION,
 	handler: (accessor, params) => {
-		const target = getSheetMutationTarget(accessor.get(_univerjs_core.IUniverInstanceService), params);
+		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
+		const target = getSheetMutationTarget(univerInstanceService, params);
 		if (!target) return false;
 		target.worksheet.setRowCount(params.rowCount);
 		return true;
@@ -2662,7 +2711,8 @@ const SetWorksheetRowHeightMutation = {
 	type: _univerjs_core.CommandType.MUTATION,
 	handler: (accessor, params) => {
 		const { ranges, rowHeight } = params;
-		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService), params);
+		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
+		const target = getSheetCommandTarget(univerInstanceService, params);
 		if (!target) return false;
 		const { worksheet } = target;
 		const manager = worksheet.getRowManager();
@@ -2676,7 +2726,8 @@ const SetWorksheetRowIsAutoHeightMutation = {
 	type: _univerjs_core.CommandType.MUTATION,
 	handler: (accessor, params) => {
 		const { ranges, autoHeightInfo } = params;
-		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService), params);
+		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
+		const target = getSheetCommandTarget(univerInstanceService, params);
 		if (!target) return false;
 		const manager = target.worksheet.getRowManager();
 		for (const { startRow, endRow } of ranges) for (let rowIndex = startRow; rowIndex <= endRow; rowIndex++) {
@@ -2692,7 +2743,8 @@ const SetWorksheetRowAutoHeightMutation = {
 	type: _univerjs_core.CommandType.MUTATION,
 	handler: (accessor, params) => {
 		const { rowsAutoHeightInfo } = params;
-		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService), params);
+		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
+		const target = getSheetCommandTarget(univerInstanceService, params);
 		if (!target) return false;
 		const rowManager = target.worksheet.getRowManager();
 		for (const { row, autoHeight } of rowsAutoHeightInfo) {
@@ -3126,18 +3178,20 @@ function getExpandedRangeLeft(range, allMatrixWithSpan, leftOffset, isWorksheetH
 		const cell = allMatrixWithSpan.getValue(i, startColumn - leftOffset);
 		hasValue = hasValue || hasValueFromMatrixWithSpanInfo(cell, allMatrixWithSpan);
 		if (!isWorksheetHasSpan && hasValue) break;
-		if (cell && cell.spanAnchor) if (!spanAnchor) spanAnchor = {
-			startRow: cell.spanAnchor.startRow,
-			startColumn: cell.spanAnchor.startColumn,
-			endRow: cell.spanAnchor.endRow,
-			endColumn: cell.spanAnchor.endColumn
-		};
-		else spanAnchor = {
-			startRow: Math.min(cell.spanAnchor.startRow, spanAnchor.startRow),
-			startColumn: Math.min(cell.spanAnchor.startColumn, spanAnchor.startColumn),
-			endRow: Math.max(cell.spanAnchor.endRow, spanAnchor.endRow),
-			endColumn: Math.max(cell.spanAnchor.endColumn, spanAnchor.endColumn)
-		};
+		if (cell && cell.spanAnchor) {
+			if (!spanAnchor) spanAnchor = {
+				startRow: cell.spanAnchor.startRow,
+				startColumn: cell.spanAnchor.startColumn,
+				endRow: cell.spanAnchor.endRow,
+				endColumn: cell.spanAnchor.endColumn
+			};
+			else spanAnchor = {
+				startRow: Math.min(cell.spanAnchor.startRow, spanAnchor.startRow),
+				startColumn: Math.min(cell.spanAnchor.startColumn, spanAnchor.startColumn),
+				endRow: Math.max(cell.spanAnchor.endRow, spanAnchor.endRow),
+				endColumn: Math.max(cell.spanAnchor.endColumn, spanAnchor.endColumn)
+			};
+		}
 	}
 	if (hasValue) {
 		range.startColumn = range.startColumn - leftOffset;
@@ -3166,18 +3220,20 @@ function getExpandedRangeRight(range, allMatrixWithSpan, rightOffset, isWorkshee
 		const cell = allMatrixWithSpan.getValue(i, endColumn + rightOffset);
 		hasValue = hasValue || hasValueFromMatrixWithSpanInfo(cell, allMatrixWithSpan);
 		if (!isWorksheetHasSpan && hasValue) break;
-		if (cell && cell.spanAnchor) if (!spanAnchor) spanAnchor = {
-			startRow: cell.spanAnchor.startRow,
-			startColumn: cell.spanAnchor.startColumn,
-			endRow: cell.spanAnchor.endRow,
-			endColumn: cell.spanAnchor.endColumn
-		};
-		else spanAnchor = {
-			startRow: Math.min(cell.spanAnchor.startRow, spanAnchor.startRow),
-			startColumn: Math.min(cell.spanAnchor.startColumn, spanAnchor.startColumn),
-			endRow: Math.max(cell.spanAnchor.endRow, spanAnchor.endRow),
-			endColumn: Math.max(cell.spanAnchor.endColumn, spanAnchor.endColumn)
-		};
+		if (cell && cell.spanAnchor) {
+			if (!spanAnchor) spanAnchor = {
+				startRow: cell.spanAnchor.startRow,
+				startColumn: cell.spanAnchor.startColumn,
+				endRow: cell.spanAnchor.endRow,
+				endColumn: cell.spanAnchor.endColumn
+			};
+			else spanAnchor = {
+				startRow: Math.min(cell.spanAnchor.startRow, spanAnchor.startRow),
+				startColumn: Math.min(cell.spanAnchor.startColumn, spanAnchor.startColumn),
+				endRow: Math.max(cell.spanAnchor.endRow, spanAnchor.endRow),
+				endColumn: Math.max(cell.spanAnchor.endColumn, spanAnchor.endColumn)
+			};
+		}
 	}
 	if (hasValue) {
 		range.endColumn = range.endColumn + rightOffset;
@@ -3206,18 +3262,20 @@ function getExpandedRangeUp(range, allMatrixWithSpan, upOffset, isWorksheetHasSp
 		const cell = allMatrixWithSpan.getValue(startRow - upOffset, i);
 		hasValue = hasValue || hasValueFromMatrixWithSpanInfo(cell, allMatrixWithSpan);
 		if (!isWorksheetHasSpan && hasValue) break;
-		if (cell && cell.spanAnchor) if (!spanAnchor) spanAnchor = {
-			startRow: cell.spanAnchor.startRow,
-			startColumn: cell.spanAnchor.startColumn,
-			endRow: cell.spanAnchor.endRow,
-			endColumn: cell.spanAnchor.endColumn
-		};
-		else spanAnchor = {
-			startRow: Math.min(cell.spanAnchor.startRow, spanAnchor.startRow),
-			startColumn: Math.min(cell.spanAnchor.startColumn, spanAnchor.startColumn),
-			endRow: Math.max(cell.spanAnchor.endRow, spanAnchor.endRow),
-			endColumn: Math.max(cell.spanAnchor.endColumn, spanAnchor.endColumn)
-		};
+		if (cell && cell.spanAnchor) {
+			if (!spanAnchor) spanAnchor = {
+				startRow: cell.spanAnchor.startRow,
+				startColumn: cell.spanAnchor.startColumn,
+				endRow: cell.spanAnchor.endRow,
+				endColumn: cell.spanAnchor.endColumn
+			};
+			else spanAnchor = {
+				startRow: Math.min(cell.spanAnchor.startRow, spanAnchor.startRow),
+				startColumn: Math.min(cell.spanAnchor.startColumn, spanAnchor.startColumn),
+				endRow: Math.max(cell.spanAnchor.endRow, spanAnchor.endRow),
+				endColumn: Math.max(cell.spanAnchor.endColumn, spanAnchor.endColumn)
+			};
+		}
 	}
 	if (hasValue) {
 		range.startRow = range.startRow - upOffset;
@@ -3246,18 +3304,20 @@ function getExpandedRangeDown(range, allMatrixWithSpan, downOffset, isWorksheetH
 		const cell = allMatrixWithSpan.getValue(endRow + downOffset, i);
 		hasValue = hasValue || hasValueFromMatrixWithSpanInfo(cell, allMatrixWithSpan);
 		if (!isWorksheetHasSpan && hasValue) break;
-		if (cell && cell.spanAnchor) if (!spanAnchor) spanAnchor = {
-			startRow: cell.spanAnchor.startRow,
-			startColumn: cell.spanAnchor.startColumn,
-			endRow: cell.spanAnchor.endRow,
-			endColumn: cell.spanAnchor.endColumn
-		};
-		else spanAnchor = {
-			startRow: Math.min(cell.spanAnchor.startRow, spanAnchor.startRow),
-			startColumn: Math.min(cell.spanAnchor.startColumn, spanAnchor.startColumn),
-			endRow: Math.max(cell.spanAnchor.endRow, spanAnchor.endRow),
-			endColumn: Math.max(cell.spanAnchor.endColumn, spanAnchor.endColumn)
-		};
+		if (cell && cell.spanAnchor) {
+			if (!spanAnchor) spanAnchor = {
+				startRow: cell.spanAnchor.startRow,
+				startColumn: cell.spanAnchor.startColumn,
+				endRow: cell.spanAnchor.endRow,
+				endColumn: cell.spanAnchor.endColumn
+			};
+			else spanAnchor = {
+				startRow: Math.min(cell.spanAnchor.startRow, spanAnchor.startRow),
+				startColumn: Math.min(cell.spanAnchor.startColumn, spanAnchor.startColumn),
+				endRow: Math.max(cell.spanAnchor.endRow, spanAnchor.endRow),
+				endColumn: Math.max(cell.spanAnchor.endColumn, spanAnchor.endColumn)
+			};
+		}
 	}
 	if (hasValue) {
 		range.endRow = range.endRow + downOffset;
@@ -3638,10 +3698,7 @@ var DelimiterCounter = class {
 			case ";":
 				this._semicolonCount++;
 				break;
-			case " ":
-				this._spaceCount++;
-				break;
-			default: break;
+			case " ": this._spaceCount++;
 		}
 	}
 	update(cellText) {
@@ -3875,7 +3932,7 @@ function deserializeListOptions(optionsStr) {
 		const options = JSON.parse(optionsStr);
 		if (Array.isArray(options) && options.every((option) => typeof option === "string")) return options.filter(Boolean);
 	} catch {}
-	return optionsStr.split(",").filter(Boolean);
+	return optionsStr.split(",").map((option) => option.trim()).filter(Boolean);
 }
 
 //#endregion
@@ -4205,9 +4262,7 @@ var WorkbookSelectionModel = class extends _univerjs_core.Disposable {
 			case 3:
 				this._selectionSet$.next(selectionDatas);
 				break;
-			default:
-				this._selectionSet$.next(selectionDatas);
-				break;
+			default: this._selectionSet$.next(selectionDatas);
 		}
 	}
 	getCurrentSelections() {
@@ -4678,10 +4733,11 @@ const ClearSelectionAllCommand = {
 		const sheetInterceptorService = accessor.get(SheetInterceptorService);
 		const redoMutations = [];
 		const undoMutations = [];
+		const visibleRanges = getVisibleRanges(ranges, accessor, unitId, subUnitId);
 		const clearMutationParams = {
 			subUnitId,
 			unitId,
-			cellValue: generateNullCell(getVisibleRanges(ranges, accessor, unitId, subUnitId))
+			cellValue: generateNullCell(visibleRanges)
 		};
 		const undoClearMutationParams = SetRangeValuesUndoMutationFactory(accessor, clearMutationParams);
 		redoMutations.push({
@@ -4748,10 +4804,11 @@ const ClearSelectionFormatCommand = {
 		const sheetInterceptorService = accessor.get(SheetInterceptorService);
 		const redoMutations = [];
 		const undoMutations = [];
+		const visibleRanges = getVisibleRanges(ranges, accessor, unitId, subUnitId);
 		const clearMutationParams = {
 			subUnitId,
 			unitId,
-			cellValue: generateNullCellStyle(getVisibleRanges(ranges, accessor, unitId, subUnitId))
+			cellValue: generateNullCellStyle(visibleRanges)
 		};
 		const undoClearMutationParams = SetRangeValuesUndoMutationFactory(accessor, clearMutationParams);
 		redoMutations.push({
@@ -5299,6 +5356,13 @@ const SetRangeValuesCommand = {
 			subUnitId,
 			cellValue: _univerjs_core.Tools.deepClone(realCellValue ?? cellValue.getMatrix())
 		};
+		new _univerjs_core.ObjectMatrix(setRangeValuesMutationRedoParams.cellValue).forValue((row, col, cell) => {
+			var _worksheet$getCell;
+			if ((cell === null || cell === void 0 ? void 0 : cell.f) !== void 0 && cell.f !== ((_worksheet$getCell = worksheet.getCell(row, col)) === null || _worksheet$getCell === void 0 ? void 0 : _worksheet$getCell.f)) {
+				cell.ft ??= null;
+				cell.fd ??= null;
+			}
+		});
 		const setRangeValuesMutationUndoParams = SetRangeValuesUndoMutationFactory(accessor, setRangeValuesMutationRedoParams);
 		const cellHeights = (0, _univerjs_core.mapObjectMatrix)(setRangeValuesMutationRedoParams.cellValue, (row, col) => worksheet.getCellHeight(row, col) || void 0);
 		if (!commandService.syncExecuteCommand(SetRangeValuesMutation.id, setRangeValuesMutationRedoParams)) return false;
@@ -5767,13 +5831,14 @@ const InsertRangeMoveDownCommand = {
 			if (!cellValue[row]) cellValue[row] = {};
 			cellValue[row][col] = { s: cell.s };
 		});
-		const { redo: insertRangeRedo, undo: insertRangeUndo } = getInsertRangeMutations(accessor, {
+		const insertRangeMutationParams = {
 			range,
 			subUnitId,
 			unitId,
 			shiftDimension: _univerjs_core.Dimension.ROWS,
 			cellValue
-		});
+		};
+		const { redo: insertRangeRedo, undo: insertRangeUndo } = getInsertRangeMutations(accessor, insertRangeMutationParams);
 		redoMutations.push(...insertRangeRedo);
 		undoMutations.push(...insertRangeUndo);
 		const sheetInterceptor = sheetInterceptorService.onCommandExecute({
@@ -5874,13 +5939,14 @@ const InsertRangeMoveRightCommand = {
 			if (!cellValue[row]) cellValue[row] = {};
 			cellValue[row][col] = { s: cell.s };
 		});
-		const { redo: insertRangeRedo, undo: insertRangeUndo } = getInsertRangeMutations(accessor, {
+		const insertRangeMutationParams = {
 			range,
 			subUnitId,
 			unitId,
 			shiftDimension: _univerjs_core.Dimension.COLUMNS,
 			cellValue
-		});
+		};
+		const { redo: insertRangeRedo, undo: insertRangeUndo } = getInsertRangeMutations(accessor, insertRangeMutationParams);
 		redoMutations.push(...insertRangeRedo);
 		undoMutations.push(...insertRangeUndo);
 		const sheetInterceptor = sheetInterceptorService.onCommandExecute({
@@ -6017,7 +6083,8 @@ const InsertRowBeforeCommand = {
 		let range;
 		if ((selections === null || selections === void 0 ? void 0 : selections.length) === 1) range = selections[0];
 		else return false;
-		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService));
+		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
+		const target = getSheetCommandTarget(univerInstanceService);
 		if (!target) return false;
 		const { worksheet, subUnitId, unitId } = target;
 		const count = params.value || 0;
@@ -6049,7 +6116,8 @@ const InsertRowAfterCommand = {
 		let range;
 		if ((selections === null || selections === void 0 ? void 0 : selections.length) === 1) range = selections[0];
 		else return false;
-		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService));
+		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
+		const target = getSheetCommandTarget(univerInstanceService);
 		if (!target) return false;
 		const { worksheet, unitId, subUnitId } = target;
 		const count = range.endRow - range.startRow + 1;
@@ -6082,7 +6150,8 @@ const InsertMultiRowsAboveCommand = {
 		let range;
 		if ((selections === null || selections === void 0 ? void 0 : selections.length) === 1) range = selections[0];
 		else return false;
-		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService));
+		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
+		const target = getSheetCommandTarget(univerInstanceService);
 		if (!target) return false;
 		const { worksheet, unitId, subUnitId } = target;
 		const count = params.value || 0;
@@ -6116,7 +6185,8 @@ const InsertMultiRowsAfterCommand = {
 		let range;
 		if ((selections === null || selections === void 0 ? void 0 : selections.length) === 1) range = selections[0];
 		else return false;
-		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService));
+		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
+		const target = getSheetCommandTarget(univerInstanceService);
 		if (!target) return false;
 		const { worksheet, unitId, subUnitId } = target;
 		const count = params.value || 0;
@@ -6238,7 +6308,8 @@ const InsertColBeforeCommand = {
 		let range;
 		if ((selections === null || selections === void 0 ? void 0 : selections.length) === 1) range = selections[0].range;
 		else return false;
-		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService));
+		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
+		const target = getSheetCommandTarget(univerInstanceService);
 		if (!target) return false;
 		const { worksheet, unitId, subUnitId } = target;
 		const count = params.value || 0;
@@ -6270,7 +6341,8 @@ const InsertColAfterCommand = {
 		let range;
 		if ((selections === null || selections === void 0 ? void 0 : selections.length) === 1) range = selections[0].range;
 		else return false;
-		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService));
+		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
+		const target = getSheetCommandTarget(univerInstanceService);
 		if (!target) return false;
 		const { worksheet, unitId, subUnitId } = target;
 		const count = range.endColumn - range.startColumn + 1;
@@ -6301,7 +6373,8 @@ const InsertMultiColsLeftCommand = {
 		let range;
 		if ((selections === null || selections === void 0 ? void 0 : selections.length) === 1) range = selections[0].range;
 		else return false;
-		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService));
+		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
+		const target = getSheetCommandTarget(univerInstanceService);
 		if (!target) return false;
 		const { worksheet, unitId, subUnitId } = target;
 		const count = params.value || 0;
@@ -6333,7 +6406,8 @@ const InsertMultiColsRightCommand = {
 		let range;
 		if ((selections === null || selections === void 0 ? void 0 : selections.length) === 1) range = selections[0].range;
 		else return false;
-		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService));
+		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
+		const target = getSheetCommandTarget(univerInstanceService);
 		if (!target) return false;
 		const { worksheet, unitId, subUnitId } = target;
 		const count = params.value || 0;
@@ -6374,7 +6448,8 @@ const RemoveRowByRangeCommand = {
 	id: "sheet.command.remove-row-by-range",
 	handler: (accessor, params) => {
 		if (!params) return false;
-		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService), params);
+		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
+		const target = getSheetCommandTarget(univerInstanceService, params);
 		if (!target) return false;
 		const { workbook, worksheet } = target;
 		const sheetInterceptorService = accessor.get(SheetInterceptorService);
@@ -6491,7 +6566,8 @@ const RemoveColByRangeCommand = {
 	id: "sheet.command.remove-col-by-range",
 	handler: (accessor, params) => {
 		if (!params) return false;
-		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService), params);
+		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
+		const target = getSheetCommandTarget(univerInstanceService, params);
 		if (!target) return false;
 		const { workbook, worksheet } = target;
 		const sheetInterceptorService = accessor.get(SheetInterceptorService);
@@ -6571,7 +6647,8 @@ 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), params);
+		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
+		const target = getSheetCommandTarget(univerInstanceService, params);
 		if (!target) return false;
 		const { worksheet, subUnitId, unitId } = target;
 		range = {
@@ -6651,7 +6728,8 @@ const MoveRowsCommand = {
 		const filteredSelections = selections === null || selections === void 0 ? void 0 : selections.filter((selection) => selection.range.rangeType === _univerjs_core.RANGE_TYPE.ROW && selection.range.startRow <= fromRow && fromRow <= selection.range.endRow);
 		if ((filteredSelections === null || filteredSelections === void 0 ? void 0 : filteredSelections.length) !== 1) return false;
 		const sheetInterceptorService = accessor.get(SheetInterceptorService);
-		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService), params);
+		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
+		const target = getSheetCommandTarget(univerInstanceService, params);
 		if (!target) return false;
 		const { workbook, worksheet } = target;
 		const unitId = workbook.getUnitId();
@@ -6762,7 +6840,8 @@ const MoveColsCommand = {
 		const filteredSelections = selections === null || selections === void 0 ? void 0 : selections.filter((selection) => selection.range.rangeType === _univerjs_core.RANGE_TYPE.COLUMN && selection.range.startColumn <= fromCol && fromCol <= selection.range.endColumn);
 		if ((filteredSelections === null || filteredSelections === void 0 ? void 0 : filteredSelections.length) !== 1) return false;
 		const sheetInterceptorService = accessor.get(SheetInterceptorService);
-		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService), params);
+		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
+		const target = getSheetCommandTarget(univerInstanceService, params);
 		if (!target) return false;
 		const { workbook, worksheet } = target;
 		const unitId = workbook.getUnitId();
@@ -7124,11 +7203,12 @@ const handleBaseMoveRowsCols = (fromRange, toRange, effectRange) => {
 			const newLine = getAbsolute(getRelative(_effectRange, fromRange), _toRange);
 			_effectRange.start = newLine.start;
 			_effectRange.end = newLine.end;
-		} else if (fromRangeIntersectsEffectRange.start > fromRange.start) if (isToLargeFrom) {
-			_effectRange.end -= fromRangeIntersectsEffectRangeStep + fromRangeStep;
-			_effectRange.start -= fromRangeStep;
-		} else _effectRange.end -= fromRangeIntersectsEffectRangeStep;
-		else if (isToLargeFrom) _effectRange.end -= fromRangeIntersectsEffectRangeStep;
+		} else if (fromRangeIntersectsEffectRange.start > fromRange.start) {
+			if (isToLargeFrom) {
+				_effectRange.end -= fromRangeIntersectsEffectRangeStep + fromRangeStep;
+				_effectRange.start -= fromRangeStep;
+			} else _effectRange.end -= fromRangeIntersectsEffectRangeStep;
+		} else if (isToLargeFrom) _effectRange.end -= fromRangeIntersectsEffectRangeStep;
 		else if (_effectRange.start > fromRange.start && _effectRange.end > fromRange.end) {
 			_effectRange.start -= fromRangeStep;
 			_effectRange.end -= fromRangeStep + fromRangeIntersectsEffectRangeStep;
@@ -7586,7 +7666,8 @@ const handleDeleteRangeMoveUpCommon = (param, targetRange) => {
 	return mergeAndSortRanges([...noMoveRanges, ...movedRanges]);
 };
 const handleRemoveRowCommon = (param, targetRange) => {
-	const mergedRemoved = (0, _univerjs_core.mergeIntervals)((param.ranges ?? [param.range]).map((range) => [range.startRow, range.endRow]));
+	const removed = (param.ranges ?? [param.range]).map((range) => [range.startRow, range.endRow]);
+	const mergedRemoved = (0, _univerjs_core.mergeIntervals)(removed);
 	let targetStartRow = targetRange.startRow;
 	let targetEndRow = targetRange.endRow;
 	for (let i = mergedRemoved.length - 1; i >= 0; i--) {
@@ -7679,9 +7760,7 @@ const runRefRangeMutations = (operators, range) => {
 				result.startRow += operator.step;
 				result.endRow += operator.step + (operator.length || 0);
 				break;
-			case 0:
-				result = operator.range;
-				break;
+			case 0: result = operator.range;
 		}
 	});
 	if (result) {
@@ -7725,9 +7804,7 @@ const handleDefaultRangeChangeWithEffectRefCommands = (range, commandInfo) => {
 		case EffectRefRangId.RemoveRowCommandId:
 			operator = handleIRemoveRow(commandInfo, range);
 			break;
-		case EffectRefRangId.ReorderRangeCommandId:
-			operator = handleReorderRange(commandInfo, range);
-			break;
+		case EffectRefRangId.ReorderRangeCommandId: operator = handleReorderRange(commandInfo, range);
 	}
 	return runRefRangeMutations(operator, range);
 };
@@ -7838,10 +7915,7 @@ function adjustRangeOnMutation(range, mutation) {
 			baseRangeOperator = handleBaseInsertRange(params.range, range);
 			baseRangeOperator.type = 2;
 			break;
-		case MoveRangeMutation.id:
-			baseRangeOperator = handleBaseMoveRange(params.fromRange || new _univerjs_core.ObjectMatrix(params.from).getRange(), params.toRange || new _univerjs_core.ObjectMatrix(params.to).getRange(), range);
-			break;
-		default: break;
+		case MoveRangeMutation.id: baseRangeOperator = handleBaseMoveRange(params.fromRange || new _univerjs_core.ObjectMatrix(params.from).getRange(), params.toRange || new _univerjs_core.ObjectMatrix(params.to).getRange(), range);
 	}
 	if (baseRangeOperator) return Array.isArray(baseRangeOperator) ? runRefRangeMutations(baseRangeOperator, range) : runRefRangeMutations([baseRangeOperator], range);
 	else return range;
@@ -7954,7 +8028,6 @@ function getEffectedRangesOnMutation(mutation) {
 		}
 		case RemoveColMutation.id: return [mutation.params.range];
 		case RemoveRowMutation.id: return [mutation.params.range];
-		default: break;
 	}
 }
 function getSeparateEffectedRangesOnCommand(accessor, command) {
@@ -8766,10 +8839,11 @@ let MergeCellController = class MergeCellController extends _univerjs_core.Dispo
 		mergeData.forEach((range) => {
 			if (sourceStart <= range.startRow && sourceEnd >= range.endRow) {
 				removeParams.ranges.push(range);
-				const result = runRefRangeMutations(handleMoveRows({
+				const operation = handleMoveRows({
 					id: EffectRefRangId.MoveRowsCommandId,
 					params
-				}, range), range);
+				}, range);
+				const result = runRefRangeMutations(operation, range);
 				result && addParams.ranges.push(result);
 			}
 		});
@@ -8816,10 +8890,11 @@ let MergeCellController = class MergeCellController extends _univerjs_core.Dispo
 		mergeData.forEach((range) => {
 			if (sourceStart <= range.startColumn && sourceEnd >= range.endColumn) {
 				removeParams.ranges.push(range);
-				const result = runRefRangeMutations(handleMoveCols({
+				const operation = handleMoveCols({
 					id: EffectRefRangId.MoveColsCommandId,
 					params
-				}, range), range);
+				}, range);
+				const result = runRefRangeMutations(operation, range);
 				result && addParams.ranges.push(result);
 			}
 		});
@@ -9787,7 +9862,8 @@ const AddWorksheetMergeCommand = {
 	type: _univerjs_core.CommandType.COMMAND,
 	id: "sheet.command.add-worksheet-merge",
 	handler: async (accessor, params) => {
-		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService), params);
+		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
+		const target = getSheetCommandTarget(univerInstanceService, params);
 		if (!target) return false;
 		const { worksheet } = target;
 		const { unitId, subUnitId, selections } = params;
@@ -9873,7 +9949,8 @@ const AddWorksheetMergeAllCommand = {
 		var _selectionManagerServ;
 		const mergeableSelections = getMergeableSelectionsByType("mergeAll", (_selectionManagerServ = accessor.get(SheetsSelectionsService).getCurrentSelections()) === null || _selectionManagerServ === void 0 ? void 0 : _selectionManagerServ.map((s) => s.range));
 		if (!(mergeableSelections === null || mergeableSelections === void 0 ? void 0 : mergeableSelections.length)) return false;
-		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService));
+		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
+		const target = getSheetCommandTarget(univerInstanceService);
 		if (!target) return false;
 		const { worksheet } = target;
 		const unitId = worksheet.getUnitId();
@@ -9892,7 +9969,8 @@ const AddWorksheetMergeVerticalCommand = {
 		var _selectionManagerServ2;
 		const mergeableSelections = getMergeableSelectionsByType("mergeVertical", (_selectionManagerServ2 = accessor.get(SheetsSelectionsService).getCurrentSelections()) === null || _selectionManagerServ2 === void 0 ? void 0 : _selectionManagerServ2.map((s) => s.range));
 		if (!(mergeableSelections === null || mergeableSelections === void 0 ? void 0 : mergeableSelections.length)) return false;
-		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService));
+		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
+		const target = getSheetCommandTarget(univerInstanceService);
 		if (!target) return false;
 		const { worksheet } = target;
 		const unitId = worksheet.getUnitId();
@@ -9912,7 +9990,8 @@ const AddWorksheetMergeHorizontalCommand = {
 		var _selectionManagerServ3;
 		const mergeableSelections = getMergeableSelectionsByType("mergeHorizontal", (_selectionManagerServ3 = accessor.get(SheetsSelectionsService).getCurrentSelections()) === null || _selectionManagerServ3 === void 0 ? void 0 : _selectionManagerServ3.map((s) => s.range));
 		if (!(mergeableSelections === null || mergeableSelections === void 0 ? void 0 : mergeableSelections.length)) return false;
-		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService));
+		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
+		const target = getSheetCommandTarget(univerInstanceService);
 		if (!target) return false;
 		const { workbook, worksheet } = target;
 		const unitId = workbook.getUnitId();
@@ -10279,7 +10358,8 @@ const SetStyleCommand = {
 	id: "sheet.command.set-style",
 	handler: (accessor, params) => {
 		var _selectionManagerServ;
-		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService), params);
+		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
+		const target = getSheetCommandTarget(univerInstanceService, params);
 		if (!target) return false;
 		const { unitId, subUnitId, worksheet } = target;
 		const { range, style } = params;
@@ -10773,13 +10853,16 @@ function numberToChinese(num) {
 function isChnNumber$1(txt) {
 	if (!txt) return false;
 	let isChnNumber = true;
-	if (txt) if (txt.length === 1) if (txt === "日" || txt in chnNumChar) isChnNumber = true;
-	else isChnNumber = false;
-	else {
-		const str = txt.split("");
-		for (let i = 0; i < str.length; i++) if (!(str[i] in chnNumChar || str[i] in chnNameValue)) {
-			isChnNumber = false;
-			break;
+	if (txt) {
+		if (txt.length === 1) {
+			if (txt === "日" || txt in chnNumChar) isChnNumber = true;
+			else isChnNumber = false;
+		} else {
+			const str = txt.split("");
+			for (let i = 0; i < str.length; i++) if (!(str[i] in chnNumChar || str[i] in chnNameValue)) {
+				isChnNumber = false;
+				break;
+			}
 		}
 	}
 	return isChnNumber;
@@ -10803,23 +10886,26 @@ function matchExtendNumber$1(txt) {
 }
 function isChnWeek1(txt) {
 	let isChnWeek1;
-	if (txt.length === 1) if (txt === "日" || chineseToNumber$1(txt) < 7) isChnWeek1 = true;
-	else isChnWeek1 = false;
-	else isChnWeek1 = false;
+	if (txt.length === 1) {
+		if (txt === "日" || chineseToNumber$1(txt) < 7) isChnWeek1 = true;
+		else isChnWeek1 = false;
+	} else isChnWeek1 = false;
 	return isChnWeek1;
 }
 function isChnWeek2$1(txt) {
 	let isChnWeek2;
-	if (txt.length === 2) if (txt === "周一" || txt === "周二" || txt === "周三" || txt === "周四" || txt === "周五" || txt === "周六" || txt === "周日") isChnWeek2 = true;
-	else isChnWeek2 = false;
-	else isChnWeek2 = false;
+	if (txt.length === 2) {
+		if (txt === "周一" || txt === "周二" || txt === "周三" || txt === "周四" || txt === "周五" || txt === "周六" || txt === "周日") isChnWeek2 = true;
+		else isChnWeek2 = false;
+	} else isChnWeek2 = false;
 	return isChnWeek2;
 }
 function isChnWeek3$1(txt) {
 	let isChnWeek3;
-	if (txt.length === 3) if (txt === "星期一" || txt === "星期二" || txt === "星期三" || txt === "星期四" || txt === "星期五" || txt === "星期六" || txt === "星期日") isChnWeek3 = true;
-	else isChnWeek3 = false;
-	else isChnWeek3 = false;
+	if (txt.length === 3) {
+		if (txt === "星期一" || txt === "星期二" || txt === "星期三" || txt === "星期四" || txt === "星期五" || txt === "星期六" || txt === "星期日") isChnWeek3 = true;
+		else isChnWeek3 = false;
+	} else isChnWeek3 = false;
 	return isChnWeek3;
 }
 function getLenS$1(indexArr, rsd) {
@@ -11584,12 +11670,13 @@ const AutoFillRules = {
 			for (let i = 0; i < data.length; i++) {
 				var _data$i3;
 				const formattedValue = `${(_data$i3 = data[i]) === null || _data$i3 === void 0 ? void 0 : _data$i3.v}`;
-				if (formattedValue === "日") if (i === 0) dataNumArr.push(0);
-				else {
-					weekIndex++;
-					dataNumArr.push(weekIndex * 7);
-				}
-				else if (hasWeek && chineseToNumber(formattedValue) > 0 && chineseToNumber(formattedValue) < 7) dataNumArr.push(chineseToNumber(formattedValue) + weekIndex * 7);
+				if (formattedValue === "日") {
+					if (i === 0) dataNumArr.push(0);
+					else {
+						weekIndex++;
+						dataNumArr.push(weekIndex * 7);
+					}
+				} else if (hasWeek && chineseToNumber(formattedValue) > 0 && chineseToNumber(formattedValue) < 7) dataNumArr.push(chineseToNumber(formattedValue) + weekIndex * 7);
 				else dataNumArr.push(chineseToNumber(formattedValue));
 			}
 			if (isReverse) {
@@ -11631,12 +11718,13 @@ const AutoFillRules = {
 				var _data$i4;
 				const formattedValue = `${(_data$i4 = data[i]) === null || _data$i4 === void 0 ? void 0 : _data$i4.v}`;
 				const lastTxt = formattedValue === null || formattedValue === void 0 ? void 0 : formattedValue.substr(formattedValue.length - 1, 1);
-				if (formattedValue === "周日") if (i === 0) dataNumArr.push(0);
-				else {
-					weekIndex++;
-					dataNumArr.push(weekIndex * 7);
-				}
-				else dataNumArr.push(chineseToNumber(lastTxt) + weekIndex * 7);
+				if (formattedValue === "周日") {
+					if (i === 0) dataNumArr.push(0);
+					else {
+						weekIndex++;
+						dataNumArr.push(weekIndex * 7);
+					}
+				} else dataNumArr.push(chineseToNumber(lastTxt) + weekIndex * 7);
 			}
 			if (isReverse) {
 				data.reverse();
@@ -11671,12 +11759,13 @@ const AutoFillRules = {
 				const formattedValue = `${(_data$i5 = data[i]) === null || _data$i5 === void 0 ? void 0 : _data$i5.v}`;
 				if (formattedValue) {
 					const lastTxt = formattedValue.substr(formattedValue.length - 1, 1);
-					if (formattedValue === "星期日") if (i === 0) dataNumArr.push(0);
-					else {
-						weekIndex++;
-						dataNumArr.push(weekIndex * 7);
-					}
-					else dataNumArr.push(chineseToNumber(lastTxt) + weekIndex * 7);
+					if (formattedValue === "星期日") {
+						if (i === 0) dataNumArr.push(0);
+						else {
+							weekIndex++;
+							dataNumArr.push(weekIndex * 7);
+						}
+					} else dataNumArr.push(chineseToNumber(lastTxt) + weekIndex * 7);
 				}
 			}
 			if (isReverse) {
@@ -11718,12 +11807,15 @@ const AutoFillRules = {
 			for (let i = 0; i < data.length; i++) {
 				var _data$i6;
 				const formattedValue = `${(_data$i6 = data[i]) === null || _data$i6 === void 0 ? void 0 : _data$i6.v}`;
-				if (formattedValue) if (formattedValue === series[0]) if (i === 0) dataNumArr.push(0);
-				else {
-					cycleIndex++;
-					dataNumArr.push(cycleIndex * series.length);
+				if (formattedValue) {
+					if (formattedValue === series[0]) {
+						if (i === 0) dataNumArr.push(0);
+						else {
+							cycleIndex++;
+							dataNumArr.push(cycleIndex * series.length);
+						}
+					} else dataNumArr.push(series.indexOf(formattedValue) + cycleIndex * 7);
 				}
-				else dataNumArr.push(series.indexOf(formattedValue) + cycleIndex * 7);
 			}
 			if (isReverse) {
 				data.reverse();
@@ -12311,10 +12403,11 @@ const ClearSelectionContentCommand = {
 		const sheetInterceptorService = accessor.get(SheetInterceptorService);
 		const redoMutations = [];
 		const undoMutations = [];
+		const visibleRanges = getVisibleRanges(ranges, accessor, unitId, subUnitId);
 		const clearMutationParams = {
 			subUnitId,
 			unitId,
-			cellValue: generateNullCellValue(getVisibleRanges(ranges, accessor, unitId, subUnitId))
+			cellValue: generateNullCellValue(visibleRanges)
 		};
 		const undoClearMutationParams = SetRangeValuesUndoMutationFactory(accessor, clearMutationParams);
 		redoMutations.push({
@@ -12437,7 +12530,7 @@ let SheetLazyExecuteScheduleService = class SheetLazyExecuteScheduleService exte
 	}
 	_scheduleNextIdle() {
 		if (this._idleCallbackId !== null) return;
-		if (typeof requestIdleCallback !== "undefined") this._idleCallbackId = requestIdleCallback((deadline) => this._processIdleTasks(deadline), { timeout: 1e3 * 60 });
+		if (typeof requestIdleCallback !== "undefined") this._idleCallbackId = requestIdleCallback((deadline) => this._processIdleTasks(deadline), { timeout: 6e4 });
 		else this._idleCallbackId = setTimeout(() => {
 			this._processIdleTasks({
 				didTimeout: false,
@@ -13506,7 +13599,8 @@ const SetColDataCommand = {
 	handler: (accessor, params) => {
 		const commandService = accessor.get(_univerjs_core.ICommandService);
 		const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
-		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService), params);
+		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
+		const target = getSheetCommandTarget(univerInstanceService, params);
 		if (!target) return false;
 		const { columnData } = params;
 		const { unitId, subUnitId, worksheet } = target;
@@ -13543,7 +13637,8 @@ const SetSpecificColsVisibleCommand = {
 		const { unitId, subUnitId, ranges } = params;
 		const sheetInterceptorService = accessor.get(SheetInterceptorService);
 		const commandService = accessor.get(_univerjs_core.ICommandService);
-		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService), {
+		const instanceService = accessor.get(_univerjs_core.IUniverInstanceService);
+		const target = getSheetCommandTarget(instanceService, {
 			unitId,
 			subUnitId
 		});
@@ -13914,7 +14009,8 @@ const SetFrozenCommand = {
 	handler: (accessor, params) => {
 		const commandService = accessor.get(_univerjs_core.ICommandService);
 		const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
-		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService), {
+		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
+		const target = getSheetCommandTarget(univerInstanceService, {
 			unitId: params.unitId,
 			subUnitId: params.subUnitId
 		});
@@ -13993,7 +14089,8 @@ const SetGridlinesColorCommand = {
 	handler: (accessor, params) => {
 		const commandService = accessor.get(_univerjs_core.ICommandService);
 		const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
-		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService), params);
+		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
+		const target = getSheetCommandTarget(univerInstanceService, params);
 		if (!target) return false;
 		const { worksheet } = target;
 		const currentlyColor = worksheet.getConfig().gridlinesColor;
@@ -14077,44 +14174,45 @@ const SetProtectionCommand = {
 		const { unitId, subUnitId } = rule;
 		const redoMutations = [];
 		const undoMutations = [];
-		if ((oldRule === null || oldRule === void 0 ? void 0 : oldRule.unitType) === rule.unitType) if (rule.unitType === _univerjs_protocol.UnitObject.Worksheet) {
-			redoMutations.push({
-				id: SetWorksheetProtectionMutation.id,
-				params: {
-					unitId,
-					subUnitId,
-					rule
-				}
-			});
-			undoMutations.push({
-				id: SetWorksheetProtectionMutation.id,
-				params: {
-					unitId,
-					subUnitId,
-					rule: oldRule
-				}
-			});
+		if ((oldRule === null || oldRule === void 0 ? void 0 : oldRule.unitType) === rule.unitType) {
+			if (rule.unitType === _univerjs_protocol.UnitObject.Worksheet) {
+				redoMutations.push({
+					id: SetWorksheetProtectionMutation.id,
+					params: {
+						unitId,
+						subUnitId,
+						rule
+					}
+				});
+				undoMutations.push({
+					id: SetWorksheetProtectionMutation.id,
+					params: {
+						unitId,
+						subUnitId,
+						rule: oldRule
+					}
+				});
+			} else {
+				redoMutations.push({
+					id: SetRangeProtectionMutation.id,
+					params: {
+						unitId,
+						subUnitId,
+						rule,
+						ruleId: rule.id
+					}
+				});
+				undoMutations.push({
+					id: SetRangeProtectionMutation.id,
+					params: {
+						unitId,
+						subUnitId,
+						ruleId: oldRule.id,
+						rule: oldRule
+					}
+				});
+			}
 		} else {
-			redoMutations.push({
-				id: SetRangeProtectionMutation.id,
-				params: {
-					unitId,
-					subUnitId,
-					rule,
-					ruleId: rule.id
-				}
-			});
-			undoMutations.push({
-				id: SetRangeProtectionMutation.id,
-				params: {
-					unitId,
-					subUnitId,
-					ruleId: oldRule.id,
-					rule: oldRule
-				}
-			});
-		}
-		else {
 			if (oldRule) {
 				if (oldRule.unitType === _univerjs_protocol.UnitObject.Worksheet) {
 					redoMutations.push({
@@ -14233,7 +14331,8 @@ const SetRowDataCommand = {
 	handler: (accessor, params) => {
 		const commandService = accessor.get(_univerjs_core.ICommandService);
 		const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
-		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService), params);
+		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
+		const target = getSheetCommandTarget(univerInstanceService, params);
 		if (!target) return false;
 		const { rowData } = params;
 		const { unitId, subUnitId, worksheet } = target;
@@ -14635,14 +14734,15 @@ const SetWorkbookNameCommand = {
 			name: params.name,
 			unitId: params.unitId
 		};
-		return (0, _univerjs_core.sequenceExecute)([
+		const redos = [
 			...interceptedCommands.preRedos ?? [],
 			{
 				id: SetWorkbookNameMutation.id,
 				params: redoMutationParams
 			},
 			...interceptedCommands.redos
-		], commandService).result;
+		];
+		return (0, _univerjs_core.sequenceExecute)(redos, commandService).result;
 	}
 };
 
@@ -14852,7 +14952,8 @@ const SetWorksheetColIsAutoWidthCommand = {
 		const commandService = accessor.get(_univerjs_core.ICommandService);
 		const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
 		const selectionManagerService = accessor.get(SheetsSelectionsService);
-		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService), params);
+		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
+		const target = getSheetCommandTarget(univerInstanceService, params);
 		if (!target) return false;
 		const { unitId, subUnitId } = target;
 		let ranges = [];
@@ -14892,7 +14993,8 @@ const SetWorksheetColumnCountCommand = {
 		const { unitId, subUnitId, columnCount } = params;
 		const commandService = accessor.get(_univerjs_core.ICommandService);
 		const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
-		if (!getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService), params)) return false;
+		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
+		if (!getSheetCommandTarget(univerInstanceService, params)) return false;
 		const redoMutationParams = {
 			unitId,
 			subUnitId,
@@ -14952,7 +15054,7 @@ const SetWorksheetHideMutationFactory = (accessor, params) => {
 	if (!target) throw new Error("[SetWorksheetHideMutationFactory]: worksheet is null error!");
 	const { worksheet } = target;
 	return {
-		hidden: worksheet.isSheetHidden(),
+		hidden: worksheet.getHiddenState(),
 		unitId: params.unitId,
 		subUnitId: worksheet.getSheetId()
 	};
@@ -14965,7 +15067,8 @@ const SetWorksheetHideMutation = {
 		if (universheet == null) return false;
 		const worksheet = universheet.getSheetBySheetId(params.subUnitId);
 		if (!worksheet) return false;
-		worksheet.getConfig().hidden = params.hidden;
+		if (params.hidden !== _univerjs_core.WorksheetHiddenState.VISIBLE && params.hidden !== _univerjs_core.WorksheetHiddenState.HIDDEN && params.hidden !== _univerjs_core.WorksheetHiddenState.VERY_HIDDEN) return false;
+		worksheet.setHiddenState(params.hidden);
 		return true;
 	}
 };
@@ -14983,14 +15086,19 @@ const SetWorksheetHideCommand = {
 		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService), params);
 		if (!target) return false;
 		const { workbook, worksheet, unitId, subUnitId } = target;
-		if (worksheet.getConfig().hidden === _univerjs_core.BooleanNumber.TRUE) return false;
+		const hidden = (params === null || params === void 0 ? void 0 : params.hidden) ?? _univerjs_core.WorksheetHiddenState.HIDDEN;
+		const currentHiddenState = worksheet.getHiddenState();
+		if (hidden !== _univerjs_core.WorksheetHiddenState.HIDDEN && hidden !== _univerjs_core.WorksheetHiddenState.VERY_HIDDEN) return false;
+		if (currentHiddenState === hidden) return false;
+		if ((params === null || params === void 0 ? void 0 : params.hidden) === void 0 && currentHiddenState !== _univerjs_core.WorksheetHiddenState.VISIBLE) return false;
 		const redoMutationParams = {
 			unitId,
 			subUnitId,
-			hidden: _univerjs_core.BooleanNumber.TRUE
+			hidden
 		};
 		const undoMutationParams = SetWorksheetHideMutationFactory(accessor, redoMutationParams);
-		if (workbook.getSheets().filter((sheet) => sheet.getConfig().hidden === _univerjs_core.BooleanNumber.FALSE).length === 1) {
+		const visibleWorksheets = workbook.getSheets().filter((sheet) => sheet.getConfig().hidden === _univerjs_core.BooleanNumber.FALSE);
+		if (currentHiddenState === _univerjs_core.WorksheetHiddenState.VISIBLE && visibleWorksheets.length === 1) {
 			errorService.emit(localeService.t("sheets.info.hideSheet"));
 			return false;
 		}
@@ -16155,12 +16263,10 @@ let WorksheetPermissionService = class WorksheetPermissionService extends _unive
 						this._permissionService.updatePermissionPoint(instance.id, true);
 					});
 					break;
-				case "set":
-					getAllWorksheetPermissionPoint().forEach((F) => {
-						const instance = new F(info.unitId, info.subUnitId);
-						this._permissionService.updatePermissionPoint(instance.id, info.rule);
-					});
-					break;
+				case "set": getAllWorksheetPermissionPoint().forEach((F) => {
+					const instance = new F(info.unitId, info.subUnitId);
+					this._permissionService.updatePermissionPoint(instance.id, info.rule);
+				});
 			}
 		}));
 	}
@@ -16408,7 +16514,8 @@ const SetWorksheetRowCountCommand = {
 		const { unitId, subUnitId, rowCount } = params;
 		const commandService = accessor.get(_univerjs_core.ICommandService);
 		const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
-		if (!getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService), params)) return false;
+		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
+		if (!getSheetCommandTarget(univerInstanceService, params)) return false;
 		const redoMutationParams = {
 			unitId,
 			subUnitId,
@@ -16635,7 +16742,8 @@ const SetWorksheetRowIsAutoHeightCommand = {
 		const commandService = accessor.get(_univerjs_core.ICommandService);
 		const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
 		const selectionManagerService = accessor.get(SheetsSelectionsService);
-		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService), params);
+		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
+		const target = getSheetCommandTarget(univerInstanceService, params);
 		if (!target) return false;
 		const { unitId, subUnitId, worksheet } = target;
 		const ranges = (params === null || params === void 0 || (_params$ranges2 = params.ranges) === null || _params$ranges2 === void 0 ? void 0 : _params$ranges2.length) ? params.ranges : (_selectionManagerServ2 = selectionManagerService.getCurrentSelections()) === null || _selectionManagerServ2 === void 0 ? void 0 : _selectionManagerServ2.map((s) => s.range);
@@ -17576,6 +17684,8 @@ let AutoFillController = class AutoFillController extends _univerjs_core.Disposa
 				if (cellData) {
 					const old = this._beforeApplyData[rowIndex][colIndex] || {};
 					cellData.f = old.f;
+					cellData.ft = old.ft;
+					cellData.fd = old.fd;
 					cellData.si = old.si;
 					cellData.t = old.t;
 					cellData.v = old.v;
@@ -17735,7 +17845,7 @@ let CalculateResultApplyController = class CalculateResultApplyController extend
 	* @param unitId
 	* @param sheetId
 	* @param cellData
-	* @returns
+	* @returns Calculated cell data merged with number formats.
 	*/
 	_getMergedCellData(unitId, sheetId, cellData) {
 		const workbook = this._univerInstanceService.getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
@@ -17744,7 +17854,8 @@ let CalculateResultApplyController = class CalculateResultApplyController extend
 		const oldCellDataMatrix = worksheet === null || worksheet === void 0 ? void 0 : worksheet.getCellMatrix();
 		const cellDataMatrix = new _univerjs_core.ObjectMatrix(cellData);
 		cellDataMatrix.forValue((row, col, cell) => {
-			const newCell = (0, _univerjs_engine_formula.handleNumfmtInCell)(oldCellDataMatrix === null || oldCellDataMatrix === void 0 ? void 0 : oldCellDataMatrix.getValue(row, col), cell, styles);
+			const oldCell = oldCellDataMatrix === null || oldCellDataMatrix === void 0 ? void 0 : oldCellDataMatrix.getValue(row, col);
+			const newCell = (0, _univerjs_engine_formula.handleNumfmtInCell)(oldCell, cell, styles);
 			cellDataMatrix.setValue(row, col, newCell);
 		});
 		return cellDataMatrix.getMatrix();
@@ -18244,8 +18355,6 @@ let SheetPermissionCheckController = class SheetPermissionCheckController extend
 					rangeTypes: [RangeProtectionPermissionEditPoint]
 				}, 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("sheets.permission.dialog.editErr");
-				break;
-			default: break;
 		}
 		if (!permission) this.blockExecuteWithoutPermission(errorMsg);
 	}
@@ -18995,14 +19104,11 @@ let ZebraCrossingCacheController = class ZebraCrossingCacheController extends _u
 						subUnitId = params.subUnitId;
 					}
 					break;
-				case SetWorksheetRowHeightMutation.id:
-					{
-						const params = commandInfo.params;
-						unitId = params.unitId;
-						subUnitId = params.subUnitId;
-					}
-					break;
-				default: break;
+				case SetWorksheetRowHeightMutation.id: {
+					const params = commandInfo.params;
+					unitId = params.unitId;
+					subUnitId = params.subUnitId;
+				}
 			}
 			if (unitId && subUnitId) {
 				this._sheetRangeThemeModel.refreshSheetRowVisibleFuncSet(unitId, subUnitId);
@@ -19384,7 +19490,7 @@ RangeProtectionCache = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets";
-var version = "1.0.0-rc.0";
+var version = "1.0.1";
 
 //#endregion
 //#region src/controllers/active-worksheet.controller.ts
@@ -20026,7 +20132,6 @@ let RangeProtectionRefRangeService = class RangeProtectionRefRangeService extend
 			case InsertColCommand.id: return this._getRefRangeMutationsByInsertCols(config.params, unitId, subUnitId);
 			case RemoveColCommand.id: return this._getRefRangeMutationsByDeleteCols(config.params, unitId, subUnitId);
 			case RemoveRowCommand.id: return this._getRefRangeMutationsByDeleteRows(config.params, unitId, subUnitId);
-			default: break;
 		}
 		return {
 			redos: [],
@@ -20593,14 +20698,12 @@ let RangeProtectionService = class RangeProtectionService extends _univerjs_core
 						this._permissionService.deletePermissionPoint(instance.id);
 					});
 					break;
-				case "set":
-					if (info.oldRule.permissionId !== info.rule.permissionId) getAllRangePermissionPoint().forEach((F) => {
-						const oldPermissionPoint = new F(info.unitId, info.subUnitId, info.oldRule.permissionId);
-						this._permissionService.deletePermissionPoint(oldPermissionPoint.id);
-						const newPermissionPoint = new F(info.unitId, info.subUnitId, info.rule.permissionId);
-						this._permissionService.addPermissionPoint(newPermissionPoint);
-					});
-					break;
+				case "set": if (info.oldRule.permissionId !== info.rule.permissionId) getAllRangePermissionPoint().forEach((F) => {
+					const oldPermissionPoint = new F(info.unitId, info.subUnitId, info.oldRule.permissionId);
+					this._permissionService.deletePermissionPoint(oldPermissionPoint.id);
+					const newPermissionPoint = new F(info.unitId, info.subUnitId, info.rule.permissionId);
+					this._permissionService.addPermissionPoint(newPermissionPoint);
+				});
 			}
 		}));
 	}
@@ -21848,6 +21951,7 @@ exports.handleMoveRange = handleMoveRange;
 exports.handleMoveRows = handleMoveRows;
 exports.isCellImage = isCellImage;
 exports.isSingleCellSelection = isSingleCellSelection;
+exports.prepareSetRangeValuesMutation = prepareSetRangeValuesMutation;
 exports.rangeMerge = rangeMerge;
 exports.rangeToDiscreteRange = rangeToDiscreteRange;
 exports.rotateRange = rotateRange;