@univerjs/sheets 1.0.3 → 1.0.4

package/lib/cjs/index.js

@@ -1649,7 +1649,7 @@ const MoveRangeMutation = {
 	handler: (accessor, params) => {
 		const { from, to } = params;
 		if (!from || !to) return false;
-		const workbook = accessor.get(_univerjs_core.IUniverInstanceService).getCurrentUnitOfType(_univerjs_core.UniverInstanceType.UNIVER_SHEET);
+		const workbook = accessor.get(_univerjs_core.IUniverInstanceService).getUnit(params.unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 		if (!workbook) return false;
 		const fromWorksheet = workbook.getSheetBySheetId(params.from.subUnitId);
 		const toWorksheet = workbook.getSheetBySheetId(params.to.subUnitId);
@@ -2320,7 +2320,9 @@ function prepareSetRangeValuesMutation(cells, styles, params) {
 	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) => {
+		var _params$sourceFormula;
 		const original = _univerjs_core.Tools.deepClone(cells.getValue(row, column) ?? null);
+		if (isStaleFormulaResult(original, (_params$sourceFormula = params.sourceFormulaData) === null || _params$sourceFormula === void 0 || (_params$sourceFormula = _params$sourceFormula[row]) === null || _params$sourceFormula === void 0 ? void 0 : _params$sourceFormula[column])) return;
 		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);
@@ -2370,7 +2372,7 @@ const SetRangeValuesMutation = {
 	id: "sheet.mutation.set-range-values",
 	type: _univerjs_core.CommandType.MUTATION,
 	handler: (accessor, params) => {
-		const { cellValue, subUnitId, unitId, isOverrideStyle } = params;
+		const { cellValue, subUnitId, unitId, isOverrideStyle, sourceFormulaData } = params;
 		const workbook = accessor.get(_univerjs_core.IUniverInstanceService).getUnit(unitId);
 		if (!workbook) return false;
 		const worksheet = workbook.getSheetBySheetId(subUnitId);
@@ -2378,6 +2380,8 @@ const SetRangeValuesMutation = {
 		const cellMatrix = worksheet.getCellMatrix();
 		const styles = workbook.getStyles();
 		new _univerjs_core.ObjectMatrix(cellValue).forValue((row, col, newVal) => {
+			var _sourceFormulaData$ro;
+			if (isStaleFormulaResult(cellMatrix.getValue(row, col), sourceFormulaData === null || sourceFormulaData === void 0 || (_sourceFormulaData$ro = sourceFormulaData[row]) === null || _sourceFormulaData$ro === void 0 ? void 0 : _sourceFormulaData$ro[col])) return;
 			if (!newVal) cellMatrix.realDeleteValue(row, col);
 			else {
 				let oldVal = cellMatrix.getValue(row, col) || {};
@@ -2389,6 +2393,9 @@ const SetRangeValuesMutation = {
 		return true;
 	}
 };
+function isStaleFormulaResult(cell, source) {
+	return source != null && (source.f !== ((cell === null || cell === void 0 ? void 0 : cell.f) ?? "") || source.si !== ((cell === null || cell === void 0 ? void 0 : cell.si) ?? void 0));
+}
 const overwriteCellPropertiesSet = /* @__PURE__ */ new Set([
 	"f",
 	"p",
@@ -10349,6 +10356,27 @@ const AFFECT_LAYOUT_STYLES = [
 	"tr",
 	"tb"
 ];
+function createStyleCellValue(worksheet, ranges, style) {
+	const cellValue = new _univerjs_core.ObjectMatrix();
+	const iterator = createRangeIteratorWithSkipFilteredRows(worksheet);
+	if (_univerjs_core.Tools.isArray(style.value)) for (let i = 0; i < ranges.length; i++) iterator.forOperableEach(ranges[i], (r, c, range) => {
+		cellValue.setValue(r, c, { s: { [style.type]: style.value[r - range.startRow][c - range.startColumn] } });
+	});
+	else {
+		const styleObj = { s: { [style.type]: style.value } };
+		for (let i = 0; i < ranges.length; i++) iterator.forOperableEach(ranges[i], (r, c) => cellValue.setValue(r, c, styleObj));
+	}
+	if (style.type === "tb" || style.type === "stf") cellValue.forValue((row, column, cell) => {
+		var _worksheet$getCompose;
+		const cellStyle = cell.s;
+		if (cellStyle.tb === _univerjs_core.WrapStrategy.WRAP) cellStyle.stf = _univerjs_core.BooleanNumber.FALSE;
+		else if (cellStyle.stf === _univerjs_core.BooleanNumber.TRUE && ((_worksheet$getCompose = worksheet.getComposedCellStyle(row, column)) === null || _worksheet$getCompose === void 0 ? void 0 : _worksheet$getCompose.tb) === _univerjs_core.WrapStrategy.WRAP) cellValue.setValue(row, column, { s: {
+			...cellStyle,
+			tb: _univerjs_core.WrapStrategy.UNSPECIFIED
+		} });
+	});
+	return cellValue;
+}
 /**
 * The command to set cell style.
 * Set style to a bunch of ranges.
@@ -10368,19 +10396,10 @@ const SetStyleCommand = {
 		const selectionManagerService = accessor.get(SheetsSelectionsService);
 		const ranges = range ? [range] : (_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 cellValue = new _univerjs_core.ObjectMatrix();
-		const iterator = createRangeIteratorWithSkipFilteredRows(worksheet);
-		if (_univerjs_core.Tools.isArray(style.value)) for (let i = 0; i < ranges.length; i++) iterator.forOperableEach(ranges[i], (r, c, range) => {
-			cellValue.setValue(r, c, { s: { [style.type]: style.value[r - range.startRow][c - range.startColumn] } });
-		});
-		else for (let i = 0; i < ranges.length; i++) {
-			const styleObj = { s: { [style.type]: style.value } };
-			iterator.forOperableEach(ranges[i], (r, c) => cellValue.setValue(r, c, styleObj));
-		}
 		const setRangeValuesMutationParams = {
 			subUnitId,
 			unitId,
-			cellValue: cellValue.getMatrix()
+			cellValue: createStyleCellValue(worksheet, ranges, style).getMatrix()
 		};
 		const skeleton = accessor.get(SheetSkeletonService).getSkeleton(unitId, subUnitId);
 		const undoSetRangeValuesMutationParams = SetRangeValuesUndoMutationFactory(accessor, setRangeValuesMutationParams);
@@ -17808,7 +17827,7 @@ let CalculateResultApplyController = class CalculateResultApplyController extend
 	_initialize() {
 		this.disposeWithMe(this._commandService.onCommandExecuted((command) => {
 			if (command.id !== _univerjs_engine_formula.SetFormulaCalculationResultMutation.id) return;
-			const { unitData } = command.params;
+			const { unitData, sourceFormulaData } = command.params;
 			const unitIds = Object.keys(unitData);
 			const redoMutationsInfo = [];
 			for (let i = 0; i < unitIds.length; i++) {
@@ -17819,6 +17838,7 @@ let CalculateResultApplyController = class CalculateResultApplyController extend
 				if (sheetData == null) continue;
 				const sheetIds = Object.keys(sheetData);
 				for (let j = 0; j < sheetIds.length; j++) {
+					var _sourceFormulaData$un;
 					const sheetId = sheetIds[j];
 					const cellData = sheetData[sheetId];
 					if (cellData == null) continue;
@@ -17826,7 +17846,8 @@ let CalculateResultApplyController = class CalculateResultApplyController extend
 					const setRangeValuesMutation = {
 						subUnitId: sheetId,
 						unitId,
-						cellValue: this._getMergedCellData(unitId, sheetId, cellData)
+						cellValue: this._getMergedCellData(unitId, sheetId, cellData, sourceFormulaData),
+						sourceFormulaData: sourceFormulaData === null || sourceFormulaData === void 0 || (_sourceFormulaData$un = sourceFormulaData[unitId]) === null || _sourceFormulaData$un === void 0 ? void 0 : _sourceFormulaData$un[sheetId]
 					};
 					redoMutationsInfo.push({
 						id: SetRangeValuesMutation.id,
@@ -17846,16 +17867,23 @@ let CalculateResultApplyController = class CalculateResultApplyController extend
 	* @param unitId
 	* @param sheetId
 	* @param cellData
+	* @param sourceFormulaData Formula identities captured before scalar evaluation.
 	* @returns Calculated cell data merged with number formats.
 	*/
-	_getMergedCellData(unitId, sheetId, cellData) {
+	_getMergedCellData(unitId, sheetId, cellData, sourceFormulaData) {
 		const workbook = this._univerInstanceService.getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 		const styles = workbook === null || workbook === void 0 ? void 0 : workbook.getStyles();
 		const worksheet = workbook === null || workbook === void 0 ? void 0 : workbook.getSheetBySheetId(sheetId);
 		const oldCellDataMatrix = worksheet === null || worksheet === void 0 ? void 0 : worksheet.getCellMatrix();
 		const cellDataMatrix = new _univerjs_core.ObjectMatrix(cellData);
 		cellDataMatrix.forValue((row, col, cell) => {
+			var _sourceFormulaData$un2;
 			const oldCell = oldCellDataMatrix === null || oldCellDataMatrix === void 0 ? void 0 : oldCellDataMatrix.getValue(row, col);
+			const sourceFormula = sourceFormulaData === null || sourceFormulaData === void 0 || (_sourceFormulaData$un2 = sourceFormulaData[unitId]) === null || _sourceFormulaData$un2 === void 0 || (_sourceFormulaData$un2 = _sourceFormulaData$un2[sheetId]) === null || _sourceFormulaData$un2 === void 0 || (_sourceFormulaData$un2 = _sourceFormulaData$un2[row]) === null || _sourceFormulaData$un2 === void 0 ? void 0 : _sourceFormulaData$un2[col];
+			if (sourceFormula != null && (sourceFormula.f !== ((oldCell === null || oldCell === void 0 ? void 0 : oldCell.f) ?? "") || sourceFormula.si !== ((oldCell === null || oldCell === void 0 ? void 0 : oldCell.si) ?? void 0))) {
+				cellDataMatrix.realDeleteValue(row, col);
+				return;
+			}
 			const newCell = (0, _univerjs_engine_formula.handleNumfmtInCell)(oldCell, cell, styles);
 			cellDataMatrix.setValue(row, col, newCell);
 		});
@@ -19491,7 +19519,7 @@ RangeProtectionCache = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets";
-var version = "1.0.3";
+var version = "1.0.4";
 
 //#endregion
 //#region src/controllers/active-worksheet.controller.ts

package/lib/es/index.js

@@ -1,4 +1,4 @@
-import { AUTO_HEIGHT_FOR_MERGED_CELLS, BORDER_KEYS, BORDER_STYLE_KEYS, BooleanNumber, BorderStyleTypes, BorderType, BuildTextUtils, COLOR_STYLE_KEYS, CellModeEnum, CellValueType, CommandType, CustomCommandExecutionError, DependentOn, Dimension, Direction, Disposable, DisposableCollection, DocumentDataModel, ErrorService, FontItalic, FontWeight, HorizontalAlign, IAuthzIoService, ICommandService, IConfigService, IConfirmService, IContextService, ILogService, IPermissionService, IResourceManagerService, IS_ROW_STYLE_PRECEDE_COLUMN_STYLE, IUndoRedoService, IUniverInstanceService, Inject, Injector, InterceptorEffectEnum, InterceptorManager, LRUMap, LocaleService, MAX_COLUMN_COUNT, MAX_ROW_COUNT, ObjectMatrix, Optional, PADDING_KEYS, PermissionStatus, Plugin, RANGE_TYPE, RTree, Range, Rectangle, RxDisposable, STYLE_KEYS, Styles, TEXT_DECORATION_KEYS, TEXT_ROTATION_KEYS, TextX, Tools, UniverInstanceType, UserManagerService, WorksheetHiddenState, cellToRange, cloneWorksheetData, composeInterceptors, concatMatrixArray, createIdentifier, createInterceptorKey, createRowColIter, generateRandomId, getArrayLength, getIntersectRange, getNumfmtLocaleTag, getNumfmtParseValueFilter, isBooleanString, isDefaultFormat, isFormulaId, isFormulaString, isICellData, isRealNum, isSafeNumeric, isTextFormat, mapObjectMatrix, merge, mergeIntervals, mergeOverrideWithDependencies, mergeWorksheetSnapshotWithDefault, moveMatrixArray, normalizeTextRuns, numfmt, regexp, registerDependencies, remove, selectionToArray, sequenceExecute, sliceMatrixArray, spliceArray, throttle, toDisposable, touchDependencies, willLoseNumericPrecision } from "@univerjs/core";
+import { AUTO_HEIGHT_FOR_MERGED_CELLS, BORDER_KEYS, BORDER_STYLE_KEYS, BooleanNumber, BorderStyleTypes, BorderType, BuildTextUtils, COLOR_STYLE_KEYS, CellModeEnum, CellValueType, CommandType, CustomCommandExecutionError, DependentOn, Dimension, Direction, Disposable, DisposableCollection, DocumentDataModel, ErrorService, FontItalic, FontWeight, HorizontalAlign, IAuthzIoService, ICommandService, IConfigService, IConfirmService, IContextService, ILogService, IPermissionService, IResourceManagerService, IS_ROW_STYLE_PRECEDE_COLUMN_STYLE, IUndoRedoService, IUniverInstanceService, Inject, Injector, InterceptorEffectEnum, InterceptorManager, LRUMap, LocaleService, MAX_COLUMN_COUNT, MAX_ROW_COUNT, ObjectMatrix, Optional, PADDING_KEYS, PermissionStatus, Plugin, RANGE_TYPE, RTree, Range, Rectangle, RxDisposable, STYLE_KEYS, Styles, TEXT_DECORATION_KEYS, TEXT_ROTATION_KEYS, TextX, Tools, UniverInstanceType, UserManagerService, WorksheetHiddenState, WrapStrategy, cellToRange, cloneWorksheetData, composeInterceptors, concatMatrixArray, createIdentifier, createInterceptorKey, createRowColIter, generateRandomId, getArrayLength, getIntersectRange, getNumfmtLocaleTag, getNumfmtParseValueFilter, isBooleanString, isDefaultFormat, isFormulaId, isFormulaString, isICellData, isRealNum, isSafeNumeric, isTextFormat, mapObjectMatrix, merge, mergeIntervals, mergeOverrideWithDependencies, mergeWorksheetSnapshotWithDefault, moveMatrixArray, normalizeTextRuns, numfmt, regexp, registerDependencies, remove, selectionToArray, sequenceExecute, sliceMatrixArray, spliceArray, throttle, toDisposable, touchDependencies, willLoseNumericPrecision } from "@univerjs/core";
 import { BehaviorSubject, Subject, distinctUntilChanged, filter, map, merge as merge$1, of, share, shareReplay, skip, switchMap, take, takeUntil } from "rxjs";
 import { IDefinedNamesService, LexerTreeBuilder, RemoveDefinedNameMutation, SetDefinedNameMutation, SetDefinedNameMutationFactory, SetFormulaCalculationResultMutation, UniverFormulaEnginePlugin, deserializeRangeWithSheet, deserializeRangeWithSheetWithCache, handleNumfmtInCell, isReferenceStringWithEffectiveColumn, operatorToken, sequenceNodeType, stripErrorMargin } from "@univerjs/engine-formula";
 import { SpreadsheetSkeleton, cjk, precisionTo } from "@univerjs/engine-render";
@@ -1648,7 +1648,7 @@ const MoveRangeMutation = {
 	handler: (accessor, params) => {
 		const { from, to } = params;
 		if (!from || !to) return false;
-		const workbook = accessor.get(IUniverInstanceService).getCurrentUnitOfType(UniverInstanceType.UNIVER_SHEET);
+		const workbook = accessor.get(IUniverInstanceService).getUnit(params.unitId, UniverInstanceType.UNIVER_SHEET);
 		if (!workbook) return false;
 		const fromWorksheet = workbook.getSheetBySheetId(params.from.subUnitId);
 		const toWorksheet = workbook.getSheetBySheetId(params.to.subUnitId);
@@ -2319,7 +2319,9 @@ function prepareSetRangeValuesMutation(cells, styles, params) {
 	const before = new ObjectMatrix();
 	const after = new ObjectMatrix();
 	new ObjectMatrix(Tools.deepClone(params.cellValue)).forValue((row, column, value) => {
+		var _params$sourceFormula;
 		const original = Tools.deepClone(cells.getValue(row, column) ?? null);
+		if (isStaleFormulaResult(original, (_params$sourceFormula = params.sourceFormulaData) === null || _params$sourceFormula === void 0 || (_params$sourceFormula = _params$sourceFormula[row]) === null || _params$sourceFormula === void 0 ? void 0 : _params$sourceFormula[column])) return;
 		before.setValue(row, column, original);
 		const next = value ? mergeCellData(value, Tools.deepClone(original ?? {}), detachedStyles, !!params.isOverrideStyle) : null;
 		after.setValue(row, column, next && !Tools.isEmptyObject(next) ? next : null);
@@ -2369,7 +2371,7 @@ const SetRangeValuesMutation = {
 	id: "sheet.mutation.set-range-values",
 	type: CommandType.MUTATION,
 	handler: (accessor, params) => {
-		const { cellValue, subUnitId, unitId, isOverrideStyle } = params;
+		const { cellValue, subUnitId, unitId, isOverrideStyle, sourceFormulaData } = params;
 		const workbook = accessor.get(IUniverInstanceService).getUnit(unitId);
 		if (!workbook) return false;
 		const worksheet = workbook.getSheetBySheetId(subUnitId);
@@ -2377,6 +2379,8 @@ const SetRangeValuesMutation = {
 		const cellMatrix = worksheet.getCellMatrix();
 		const styles = workbook.getStyles();
 		new ObjectMatrix(cellValue).forValue((row, col, newVal) => {
+			var _sourceFormulaData$ro;
+			if (isStaleFormulaResult(cellMatrix.getValue(row, col), sourceFormulaData === null || sourceFormulaData === void 0 || (_sourceFormulaData$ro = sourceFormulaData[row]) === null || _sourceFormulaData$ro === void 0 ? void 0 : _sourceFormulaData$ro[col])) return;
 			if (!newVal) cellMatrix.realDeleteValue(row, col);
 			else {
 				let oldVal = cellMatrix.getValue(row, col) || {};
@@ -2388,6 +2392,9 @@ const SetRangeValuesMutation = {
 		return true;
 	}
 };
+function isStaleFormulaResult(cell, source) {
+	return source != null && (source.f !== ((cell === null || cell === void 0 ? void 0 : cell.f) ?? "") || source.si !== ((cell === null || cell === void 0 ? void 0 : cell.si) ?? void 0));
+}
 const overwriteCellPropertiesSet = /* @__PURE__ */ new Set([
 	"f",
 	"p",
@@ -10348,6 +10355,27 @@ const AFFECT_LAYOUT_STYLES = [
 	"tr",
 	"tb"
 ];
+function createStyleCellValue(worksheet, ranges, style) {
+	const cellValue = new ObjectMatrix();
+	const iterator = createRangeIteratorWithSkipFilteredRows(worksheet);
+	if (Tools.isArray(style.value)) for (let i = 0; i < ranges.length; i++) iterator.forOperableEach(ranges[i], (r, c, range) => {
+		cellValue.setValue(r, c, { s: { [style.type]: style.value[r - range.startRow][c - range.startColumn] } });
+	});
+	else {
+		const styleObj = { s: { [style.type]: style.value } };
+		for (let i = 0; i < ranges.length; i++) iterator.forOperableEach(ranges[i], (r, c) => cellValue.setValue(r, c, styleObj));
+	}
+	if (style.type === "tb" || style.type === "stf") cellValue.forValue((row, column, cell) => {
+		var _worksheet$getCompose;
+		const cellStyle = cell.s;
+		if (cellStyle.tb === WrapStrategy.WRAP) cellStyle.stf = BooleanNumber.FALSE;
+		else if (cellStyle.stf === BooleanNumber.TRUE && ((_worksheet$getCompose = worksheet.getComposedCellStyle(row, column)) === null || _worksheet$getCompose === void 0 ? void 0 : _worksheet$getCompose.tb) === WrapStrategy.WRAP) cellValue.setValue(row, column, { s: {
+			...cellStyle,
+			tb: WrapStrategy.UNSPECIFIED
+		} });
+	});
+	return cellValue;
+}
 /**
 * The command to set cell style.
 * Set style to a bunch of ranges.
@@ -10367,19 +10395,10 @@ const SetStyleCommand = {
 		const selectionManagerService = accessor.get(SheetsSelectionsService);
 		const ranges = range ? [range] : (_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 cellValue = new ObjectMatrix();
-		const iterator = createRangeIteratorWithSkipFilteredRows(worksheet);
-		if (Tools.isArray(style.value)) for (let i = 0; i < ranges.length; i++) iterator.forOperableEach(ranges[i], (r, c, range) => {
-			cellValue.setValue(r, c, { s: { [style.type]: style.value[r - range.startRow][c - range.startColumn] } });
-		});
-		else for (let i = 0; i < ranges.length; i++) {
-			const styleObj = { s: { [style.type]: style.value } };
-			iterator.forOperableEach(ranges[i], (r, c) => cellValue.setValue(r, c, styleObj));
-		}
 		const setRangeValuesMutationParams = {
 			subUnitId,
 			unitId,
-			cellValue: cellValue.getMatrix()
+			cellValue: createStyleCellValue(worksheet, ranges, style).getMatrix()
 		};
 		const skeleton = accessor.get(SheetSkeletonService).getSkeleton(unitId, subUnitId);
 		const undoSetRangeValuesMutationParams = SetRangeValuesUndoMutationFactory(accessor, setRangeValuesMutationParams);
@@ -17807,7 +17826,7 @@ let CalculateResultApplyController = class CalculateResultApplyController extend
 	_initialize() {
 		this.disposeWithMe(this._commandService.onCommandExecuted((command) => {
 			if (command.id !== SetFormulaCalculationResultMutation.id) return;
-			const { unitData } = command.params;
+			const { unitData, sourceFormulaData } = command.params;
 			const unitIds = Object.keys(unitData);
 			const redoMutationsInfo = [];
 			for (let i = 0; i < unitIds.length; i++) {
@@ -17818,6 +17837,7 @@ let CalculateResultApplyController = class CalculateResultApplyController extend
 				if (sheetData == null) continue;
 				const sheetIds = Object.keys(sheetData);
 				for (let j = 0; j < sheetIds.length; j++) {
+					var _sourceFormulaData$un;
 					const sheetId = sheetIds[j];
 					const cellData = sheetData[sheetId];
 					if (cellData == null) continue;
@@ -17825,7 +17845,8 @@ let CalculateResultApplyController = class CalculateResultApplyController extend
 					const setRangeValuesMutation = {
 						subUnitId: sheetId,
 						unitId,
-						cellValue: this._getMergedCellData(unitId, sheetId, cellData)
+						cellValue: this._getMergedCellData(unitId, sheetId, cellData, sourceFormulaData),
+						sourceFormulaData: sourceFormulaData === null || sourceFormulaData === void 0 || (_sourceFormulaData$un = sourceFormulaData[unitId]) === null || _sourceFormulaData$un === void 0 ? void 0 : _sourceFormulaData$un[sheetId]
 					};
 					redoMutationsInfo.push({
 						id: SetRangeValuesMutation.id,
@@ -17845,16 +17866,23 @@ let CalculateResultApplyController = class CalculateResultApplyController extend
 	* @param unitId
 	* @param sheetId
 	* @param cellData
+	* @param sourceFormulaData Formula identities captured before scalar evaluation.
 	* @returns Calculated cell data merged with number formats.
 	*/
-	_getMergedCellData(unitId, sheetId, cellData) {
+	_getMergedCellData(unitId, sheetId, cellData, sourceFormulaData) {
 		const workbook = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET);
 		const styles = workbook === null || workbook === void 0 ? void 0 : workbook.getStyles();
 		const worksheet = workbook === null || workbook === void 0 ? void 0 : workbook.getSheetBySheetId(sheetId);
 		const oldCellDataMatrix = worksheet === null || worksheet === void 0 ? void 0 : worksheet.getCellMatrix();
 		const cellDataMatrix = new ObjectMatrix(cellData);
 		cellDataMatrix.forValue((row, col, cell) => {
+			var _sourceFormulaData$un2;
 			const oldCell = oldCellDataMatrix === null || oldCellDataMatrix === void 0 ? void 0 : oldCellDataMatrix.getValue(row, col);
+			const sourceFormula = sourceFormulaData === null || sourceFormulaData === void 0 || (_sourceFormulaData$un2 = sourceFormulaData[unitId]) === null || _sourceFormulaData$un2 === void 0 || (_sourceFormulaData$un2 = _sourceFormulaData$un2[sheetId]) === null || _sourceFormulaData$un2 === void 0 || (_sourceFormulaData$un2 = _sourceFormulaData$un2[row]) === null || _sourceFormulaData$un2 === void 0 ? void 0 : _sourceFormulaData$un2[col];
+			if (sourceFormula != null && (sourceFormula.f !== ((oldCell === null || oldCell === void 0 ? void 0 : oldCell.f) ?? "") || sourceFormula.si !== ((oldCell === null || oldCell === void 0 ? void 0 : oldCell.si) ?? void 0))) {
+				cellDataMatrix.realDeleteValue(row, col);
+				return;
+			}
 			const newCell = handleNumfmtInCell(oldCell, cell, styles);
 			cellDataMatrix.setValue(row, col, newCell);
 		});
@@ -19490,7 +19518,7 @@ RangeProtectionCache = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets";
-var version = "1.0.3";
+var version = "1.0.4";
 
 //#endregion
 //#region src/controllers/active-worksheet.controller.ts

package/lib/index.js

@@ -1,4 +1,4 @@
-import { AUTO_HEIGHT_FOR_MERGED_CELLS, BORDER_KEYS, BORDER_STYLE_KEYS, BooleanNumber, BorderStyleTypes, BorderType, BuildTextUtils, COLOR_STYLE_KEYS, CellModeEnum, CellValueType, CommandType, CustomCommandExecutionError, DependentOn, Dimension, Direction, Disposable, DisposableCollection, DocumentDataModel, ErrorService, FontItalic, FontWeight, HorizontalAlign, IAuthzIoService, ICommandService, IConfigService, IConfirmService, IContextService, ILogService, IPermissionService, IResourceManagerService, IS_ROW_STYLE_PRECEDE_COLUMN_STYLE, IUndoRedoService, IUniverInstanceService, Inject, Injector, InterceptorEffectEnum, InterceptorManager, LRUMap, LocaleService, MAX_COLUMN_COUNT, MAX_ROW_COUNT, ObjectMatrix, Optional, PADDING_KEYS, PermissionStatus, Plugin, RANGE_TYPE, RTree, Range, Rectangle, RxDisposable, STYLE_KEYS, Styles, TEXT_DECORATION_KEYS, TEXT_ROTATION_KEYS, TextX, Tools, UniverInstanceType, UserManagerService, WorksheetHiddenState, cellToRange, cloneWorksheetData, composeInterceptors, concatMatrixArray, createIdentifier, createInterceptorKey, createRowColIter, generateRandomId, getArrayLength, getIntersectRange, getNumfmtLocaleTag, getNumfmtParseValueFilter, isBooleanString, isDefaultFormat, isFormulaId, isFormulaString, isICellData, isRealNum, isSafeNumeric, isTextFormat, mapObjectMatrix, merge, mergeIntervals, mergeOverrideWithDependencies, mergeWorksheetSnapshotWithDefault, moveMatrixArray, normalizeTextRuns, numfmt, regexp, registerDependencies, remove, selectionToArray, sequenceExecute, sliceMatrixArray, spliceArray, throttle, toDisposable, touchDependencies, willLoseNumericPrecision } from "@univerjs/core";
+import { AUTO_HEIGHT_FOR_MERGED_CELLS, BORDER_KEYS, BORDER_STYLE_KEYS, BooleanNumber, BorderStyleTypes, BorderType, BuildTextUtils, COLOR_STYLE_KEYS, CellModeEnum, CellValueType, CommandType, CustomCommandExecutionError, DependentOn, Dimension, Direction, Disposable, DisposableCollection, DocumentDataModel, ErrorService, FontItalic, FontWeight, HorizontalAlign, IAuthzIoService, ICommandService, IConfigService, IConfirmService, IContextService, ILogService, IPermissionService, IResourceManagerService, IS_ROW_STYLE_PRECEDE_COLUMN_STYLE, IUndoRedoService, IUniverInstanceService, Inject, Injector, InterceptorEffectEnum, InterceptorManager, LRUMap, LocaleService, MAX_COLUMN_COUNT, MAX_ROW_COUNT, ObjectMatrix, Optional, PADDING_KEYS, PermissionStatus, Plugin, RANGE_TYPE, RTree, Range, Rectangle, RxDisposable, STYLE_KEYS, Styles, TEXT_DECORATION_KEYS, TEXT_ROTATION_KEYS, TextX, Tools, UniverInstanceType, UserManagerService, WorksheetHiddenState, WrapStrategy, cellToRange, cloneWorksheetData, composeInterceptors, concatMatrixArray, createIdentifier, createInterceptorKey, createRowColIter, generateRandomId, getArrayLength, getIntersectRange, getNumfmtLocaleTag, getNumfmtParseValueFilter, isBooleanString, isDefaultFormat, isFormulaId, isFormulaString, isICellData, isRealNum, isSafeNumeric, isTextFormat, mapObjectMatrix, merge, mergeIntervals, mergeOverrideWithDependencies, mergeWorksheetSnapshotWithDefault, moveMatrixArray, normalizeTextRuns, numfmt, regexp, registerDependencies, remove, selectionToArray, sequenceExecute, sliceMatrixArray, spliceArray, throttle, toDisposable, touchDependencies, willLoseNumericPrecision } from "@univerjs/core";
 import { BehaviorSubject, Subject, distinctUntilChanged, filter, map, merge as merge$1, of, share, shareReplay, skip, switchMap, take, takeUntil } from "rxjs";
 import { IDefinedNamesService, LexerTreeBuilder, RemoveDefinedNameMutation, SetDefinedNameMutation, SetDefinedNameMutationFactory, SetFormulaCalculationResultMutation, UniverFormulaEnginePlugin, deserializeRangeWithSheet, deserializeRangeWithSheetWithCache, handleNumfmtInCell, isReferenceStringWithEffectiveColumn, operatorToken, sequenceNodeType, stripErrorMargin } from "@univerjs/engine-formula";
 import { SpreadsheetSkeleton, cjk, precisionTo } from "@univerjs/engine-render";
@@ -1648,7 +1648,7 @@ const MoveRangeMutation = {
 	handler: (accessor, params) => {
 		const { from, to } = params;
 		if (!from || !to) return false;
-		const workbook = accessor.get(IUniverInstanceService).getCurrentUnitOfType(UniverInstanceType.UNIVER_SHEET);
+		const workbook = accessor.get(IUniverInstanceService).getUnit(params.unitId, UniverInstanceType.UNIVER_SHEET);
 		if (!workbook) return false;
 		const fromWorksheet = workbook.getSheetBySheetId(params.from.subUnitId);
 		const toWorksheet = workbook.getSheetBySheetId(params.to.subUnitId);
@@ -2319,7 +2319,9 @@ function prepareSetRangeValuesMutation(cells, styles, params) {
 	const before = new ObjectMatrix();
 	const after = new ObjectMatrix();
 	new ObjectMatrix(Tools.deepClone(params.cellValue)).forValue((row, column, value) => {
+		var _params$sourceFormula;
 		const original = Tools.deepClone(cells.getValue(row, column) ?? null);
+		if (isStaleFormulaResult(original, (_params$sourceFormula = params.sourceFormulaData) === null || _params$sourceFormula === void 0 || (_params$sourceFormula = _params$sourceFormula[row]) === null || _params$sourceFormula === void 0 ? void 0 : _params$sourceFormula[column])) return;
 		before.setValue(row, column, original);
 		const next = value ? mergeCellData(value, Tools.deepClone(original ?? {}), detachedStyles, !!params.isOverrideStyle) : null;
 		after.setValue(row, column, next && !Tools.isEmptyObject(next) ? next : null);
@@ -2369,7 +2371,7 @@ const SetRangeValuesMutation = {
 	id: "sheet.mutation.set-range-values",
 	type: CommandType.MUTATION,
 	handler: (accessor, params) => {
-		const { cellValue, subUnitId, unitId, isOverrideStyle } = params;
+		const { cellValue, subUnitId, unitId, isOverrideStyle, sourceFormulaData } = params;
 		const workbook = accessor.get(IUniverInstanceService).getUnit(unitId);
 		if (!workbook) return false;
 		const worksheet = workbook.getSheetBySheetId(subUnitId);
@@ -2377,6 +2379,8 @@ const SetRangeValuesMutation = {
 		const cellMatrix = worksheet.getCellMatrix();
 		const styles = workbook.getStyles();
 		new ObjectMatrix(cellValue).forValue((row, col, newVal) => {
+			var _sourceFormulaData$ro;
+			if (isStaleFormulaResult(cellMatrix.getValue(row, col), sourceFormulaData === null || sourceFormulaData === void 0 || (_sourceFormulaData$ro = sourceFormulaData[row]) === null || _sourceFormulaData$ro === void 0 ? void 0 : _sourceFormulaData$ro[col])) return;
 			if (!newVal) cellMatrix.realDeleteValue(row, col);
 			else {
 				let oldVal = cellMatrix.getValue(row, col) || {};
@@ -2388,6 +2392,9 @@ const SetRangeValuesMutation = {
 		return true;
 	}
 };
+function isStaleFormulaResult(cell, source) {
+	return source != null && (source.f !== ((cell === null || cell === void 0 ? void 0 : cell.f) ?? "") || source.si !== ((cell === null || cell === void 0 ? void 0 : cell.si) ?? void 0));
+}
 const overwriteCellPropertiesSet = /* @__PURE__ */ new Set([
 	"f",
 	"p",
@@ -10348,6 +10355,27 @@ const AFFECT_LAYOUT_STYLES = [
 	"tr",
 	"tb"
 ];
+function createStyleCellValue(worksheet, ranges, style) {
+	const cellValue = new ObjectMatrix();
+	const iterator = createRangeIteratorWithSkipFilteredRows(worksheet);
+	if (Tools.isArray(style.value)) for (let i = 0; i < ranges.length; i++) iterator.forOperableEach(ranges[i], (r, c, range) => {
+		cellValue.setValue(r, c, { s: { [style.type]: style.value[r - range.startRow][c - range.startColumn] } });
+	});
+	else {
+		const styleObj = { s: { [style.type]: style.value } };
+		for (let i = 0; i < ranges.length; i++) iterator.forOperableEach(ranges[i], (r, c) => cellValue.setValue(r, c, styleObj));
+	}
+	if (style.type === "tb" || style.type === "stf") cellValue.forValue((row, column, cell) => {
+		var _worksheet$getCompose;
+		const cellStyle = cell.s;
+		if (cellStyle.tb === WrapStrategy.WRAP) cellStyle.stf = BooleanNumber.FALSE;
+		else if (cellStyle.stf === BooleanNumber.TRUE && ((_worksheet$getCompose = worksheet.getComposedCellStyle(row, column)) === null || _worksheet$getCompose === void 0 ? void 0 : _worksheet$getCompose.tb) === WrapStrategy.WRAP) cellValue.setValue(row, column, { s: {
+			...cellStyle,
+			tb: WrapStrategy.UNSPECIFIED
+		} });
+	});
+	return cellValue;
+}
 /**
 * The command to set cell style.
 * Set style to a bunch of ranges.
@@ -10367,19 +10395,10 @@ const SetStyleCommand = {
 		const selectionManagerService = accessor.get(SheetsSelectionsService);
 		const ranges = range ? [range] : (_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 cellValue = new ObjectMatrix();
-		const iterator = createRangeIteratorWithSkipFilteredRows(worksheet);
-		if (Tools.isArray(style.value)) for (let i = 0; i < ranges.length; i++) iterator.forOperableEach(ranges[i], (r, c, range) => {
-			cellValue.setValue(r, c, { s: { [style.type]: style.value[r - range.startRow][c - range.startColumn] } });
-		});
-		else for (let i = 0; i < ranges.length; i++) {
-			const styleObj = { s: { [style.type]: style.value } };
-			iterator.forOperableEach(ranges[i], (r, c) => cellValue.setValue(r, c, styleObj));
-		}
 		const setRangeValuesMutationParams = {
 			subUnitId,
 			unitId,
-			cellValue: cellValue.getMatrix()
+			cellValue: createStyleCellValue(worksheet, ranges, style).getMatrix()
 		};
 		const skeleton = accessor.get(SheetSkeletonService).getSkeleton(unitId, subUnitId);
 		const undoSetRangeValuesMutationParams = SetRangeValuesUndoMutationFactory(accessor, setRangeValuesMutationParams);
@@ -17807,7 +17826,7 @@ let CalculateResultApplyController = class CalculateResultApplyController extend
 	_initialize() {
 		this.disposeWithMe(this._commandService.onCommandExecuted((command) => {
 			if (command.id !== SetFormulaCalculationResultMutation.id) return;
-			const { unitData } = command.params;
+			const { unitData, sourceFormulaData } = command.params;
 			const unitIds = Object.keys(unitData);
 			const redoMutationsInfo = [];
 			for (let i = 0; i < unitIds.length; i++) {
@@ -17818,6 +17837,7 @@ let CalculateResultApplyController = class CalculateResultApplyController extend
 				if (sheetData == null) continue;
 				const sheetIds = Object.keys(sheetData);
 				for (let j = 0; j < sheetIds.length; j++) {
+					var _sourceFormulaData$un;
 					const sheetId = sheetIds[j];
 					const cellData = sheetData[sheetId];
 					if (cellData == null) continue;
@@ -17825,7 +17845,8 @@ let CalculateResultApplyController = class CalculateResultApplyController extend
 					const setRangeValuesMutation = {
 						subUnitId: sheetId,
 						unitId,
-						cellValue: this._getMergedCellData(unitId, sheetId, cellData)
+						cellValue: this._getMergedCellData(unitId, sheetId, cellData, sourceFormulaData),
+						sourceFormulaData: sourceFormulaData === null || sourceFormulaData === void 0 || (_sourceFormulaData$un = sourceFormulaData[unitId]) === null || _sourceFormulaData$un === void 0 ? void 0 : _sourceFormulaData$un[sheetId]
 					};
 					redoMutationsInfo.push({
 						id: SetRangeValuesMutation.id,
@@ -17845,16 +17866,23 @@ let CalculateResultApplyController = class CalculateResultApplyController extend
 	* @param unitId
 	* @param sheetId
 	* @param cellData
+	* @param sourceFormulaData Formula identities captured before scalar evaluation.
 	* @returns Calculated cell data merged with number formats.
 	*/
-	_getMergedCellData(unitId, sheetId, cellData) {
+	_getMergedCellData(unitId, sheetId, cellData, sourceFormulaData) {
 		const workbook = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET);
 		const styles = workbook === null || workbook === void 0 ? void 0 : workbook.getStyles();
 		const worksheet = workbook === null || workbook === void 0 ? void 0 : workbook.getSheetBySheetId(sheetId);
 		const oldCellDataMatrix = worksheet === null || worksheet === void 0 ? void 0 : worksheet.getCellMatrix();
 		const cellDataMatrix = new ObjectMatrix(cellData);
 		cellDataMatrix.forValue((row, col, cell) => {
+			var _sourceFormulaData$un2;
 			const oldCell = oldCellDataMatrix === null || oldCellDataMatrix === void 0 ? void 0 : oldCellDataMatrix.getValue(row, col);
+			const sourceFormula = sourceFormulaData === null || sourceFormulaData === void 0 || (_sourceFormulaData$un2 = sourceFormulaData[unitId]) === null || _sourceFormulaData$un2 === void 0 || (_sourceFormulaData$un2 = _sourceFormulaData$un2[sheetId]) === null || _sourceFormulaData$un2 === void 0 || (_sourceFormulaData$un2 = _sourceFormulaData$un2[row]) === null || _sourceFormulaData$un2 === void 0 ? void 0 : _sourceFormulaData$un2[col];
+			if (sourceFormula != null && (sourceFormula.f !== ((oldCell === null || oldCell === void 0 ? void 0 : oldCell.f) ?? "") || sourceFormula.si !== ((oldCell === null || oldCell === void 0 ? void 0 : oldCell.si) ?? void 0))) {
+				cellDataMatrix.realDeleteValue(row, col);
+				return;
+			}
 			const newCell = handleNumfmtInCell(oldCell, cell, styles);
 			cellDataMatrix.setValue(row, col, newCell);
 		});
@@ -19490,7 +19518,7 @@ RangeProtectionCache = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets";
-var version = "1.0.3";
+var version = "1.0.4";
 
 //#endregion
 //#region src/controllers/active-worksheet.controller.ts

package/lib/types/commands/commands/set-style.command.d.ts

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { HorizontalAlign, ICommand, IRange, IStyleData, VerticalAlign, WrapStrategy } from '@univerjs/core';
+import type { HorizontalAlign, ICommand, IRange, IStyleData, VerticalAlign } from '@univerjs/core';
 import type { ISheetCommandSharedParams } from '../utils/interface';
-import { BooleanNumber } from '@univerjs/core';
+import { BooleanNumber, WrapStrategy } from '@univerjs/core';
 export interface IStyleTypeValue<T> {
     type: keyof IStyleData;
     value: T | T[][];

package/lib/types/commands/mutations/set-range-values.mutation.d.ts

@@ -28,6 +28,8 @@ export interface ISetRangeValuesMutationParams extends IMutationCommonParams {
      * @default false
      */
     isOverrideStyle?: boolean;
+    /** Formula identities retained for conditional result application across Worker replay. */
+    sourceFormulaData?: IObjectMatrixPrimitiveType<Pick<ICellData, 'f' | 'si'>>;
 }
 export interface ISetRangeValuesRangeMutationParams extends ISetRangeValuesMutationParams {
     range: IRange[];
@@ -37,7 +39,7 @@ export interface ISetRangeValuesRangeMutationParams extends ISetRangeValuesMutat
  * 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.
  */
-export declare function prepareSetRangeValuesMutation(cells: ObjectMatrix<Nullable<ICellData>>, styles: Styles, params: Pick<ISetRangeValuesMutationParams, 'cellValue' | 'isOverrideStyle'>): {
+export declare function prepareSetRangeValuesMutation(cells: ObjectMatrix<Nullable<ICellData>>, styles: Styles, params: Pick<ISetRangeValuesMutationParams, 'cellValue' | 'isOverrideStyle' | 'sourceFormulaData'>): {
     before: IObjectMatrixPrimitiveType<Nullable<ICellData>>;
     after: IObjectMatrixPrimitiveType<Nullable<ICellData>>;
     styles: Record<string, IStyleData>;

package/lib/types/controllers/calculate-result-apply.controller.d.ts

@@ -24,6 +24,7 @@ export declare class CalculateResultApplyController extends Disposable {
      * @param unitId
      * @param sheetId
      * @param cellData
+     * @param sourceFormulaData Formula identities captured before scalar evaluation.
      * @returns Calculated cell data merged with number formats.
      */
     private _getMergedCellData;