@univerjs/sheets 1.0.0-beta.0 → 1.0.0-beta.2

package/lib/cjs/index.js

@@ -6999,6 +6999,88 @@ const rotateRange = (range) => {
 		rangeType
 	};
 };
+function mergeAndSortRanges(ranges) {
+	return sortRanges(ranges.length > 1 ? _univerjs_core.Rectangle.mergeRanges(ranges) : ranges);
+}
+function sortRanges(ranges) {
+	return ranges.sort((a, b) => a.startRow - b.startRow || a.startColumn - b.startColumn || a.endRow - b.endRow || a.endColumn - b.endColumn);
+}
+function translateRange(range, rowOffset, columnOffset) {
+	return {
+		startRow: range.startRow + rowOffset,
+		endRow: range.endRow + rowOffset,
+		startColumn: range.startColumn + columnOffset,
+		endColumn: range.endColumn + columnOffset
+	};
+}
+function moveRangeAlongAxis(targetRange, from, count, to, isRow) {
+	let transforms;
+	if (from > to) transforms = [
+		{
+			start: Number.NEGATIVE_INFINITY,
+			end: to - 1,
+			offset: 0
+		},
+		{
+			start: to,
+			end: from - 1,
+			offset: count
+		},
+		{
+			start: from,
+			end: from + count - 1,
+			offset: to - from
+		},
+		{
+			start: from + count,
+			end: Number.POSITIVE_INFINITY,
+			offset: 0
+		}
+	];
+	else {
+		if (from + count > to) throw new Error("Invalid move operation");
+		transforms = [
+			{
+				start: Number.NEGATIVE_INFINITY,
+				end: from - 1,
+				offset: 0
+			},
+			{
+				start: from,
+				end: from + count - 1,
+				offset: to - from - count
+			},
+			{
+				start: from + count,
+				end: to - 1,
+				offset: -count
+			},
+			{
+				start: to,
+				end: Number.POSITIVE_INFINITY,
+				offset: 0
+			}
+		];
+	}
+	const rangeStart = isRow ? targetRange.startRow : targetRange.startColumn;
+	const rangeEnd = isRow ? targetRange.endRow : targetRange.endColumn;
+	return mergeAndSortRanges(transforms.flatMap(({ start, end, offset }) => {
+		const intersectStart = Math.max(rangeStart, start);
+		const intersectEnd = Math.min(rangeEnd, end);
+		if (intersectStart > intersectEnd) return [];
+		return [translateRange(isRow ? {
+			startRow: intersectStart,
+			endRow: intersectEnd,
+			startColumn: targetRange.startColumn,
+			endColumn: targetRange.endColumn
+		} : {
+			startRow: targetRange.startRow,
+			endRow: targetRange.endRow,
+			startColumn: intersectStart,
+			endColumn: intersectEnd
+		}, isRow ? offset : 0, isRow ? 0 : offset)];
+	}));
+}
 /**
 * see docs/tldr/ref-range/move-rows-cols.tldr
 */
@@ -7104,32 +7186,33 @@ const handleMoveRowsCommon = (params, targetRange) => {
 	const fromRow = fromRange.startRow;
 	const count = fromRange.endRow - fromRange.startRow + 1;
 	const toRow = toRange.startRow;
-	const matrix = new _univerjs_core.ObjectMatrix();
-	_univerjs_core.Range.foreach(targetRange, (row, col) => {
-		matrix.setValue(row, col, 1);
-	});
-	matrix.moveRows(fromRow, count, toRow);
-	return (0, _univerjs_core.queryObjectMatrix)(matrix, (value) => value === 1);
+	return moveRangeAlongAxis(targetRange, fromRow, count, toRow, true);
 };
 const handleReorderRangeCommon = (param, targetRange) => {
 	const { range, order } = param.params || {};
 	if (!range || !order) return [targetRange];
-	const matrix = new _univerjs_core.ObjectMatrix();
-	_univerjs_core.Range.foreach(targetRange, (row, col) => {
-		matrix.setValue(row, col, 1);
-	});
-	const cacheMatrix = new _univerjs_core.ObjectMatrix();
-	_univerjs_core.Range.foreach(range, (row, col) => {
-		if (Object.prototype.hasOwnProperty.call(order, row)) {
-			const targetRow = order[row];
-			const cloneCell = matrix.getValue(targetRow, col) ?? 0;
-			cacheMatrix.setValue(row, col, cloneCell);
-		}
-	});
-	cacheMatrix.forValue((row, col, cellData) => {
-		matrix.setValue(row, col, cellData);
+	const overwrittenRows = [];
+	const additions = [];
+	const startColumn = Math.max(range.startColumn, targetRange.startColumn);
+	const endColumn = Math.min(range.endColumn, targetRange.endColumn);
+	Object.keys(order).forEach((key) => {
+		const row = Number(key);
+		if (row < range.startRow || row > range.endRow) return;
+		overwrittenRows.push({
+			startRow: row,
+			endRow: row,
+			startColumn: range.startColumn,
+			endColumn: range.endColumn
+		});
+		const sourceRow = order[row];
+		if (sourceRow >= targetRange.startRow && sourceRow <= targetRange.endRow && startColumn <= endColumn) additions.push({
+			startRow: row,
+			endRow: row,
+			startColumn,
+			endColumn
+		});
 	});
-	return (0, _univerjs_core.queryObjectMatrix)(matrix, (value) => value === 1);
+	return mergeAndSortRanges([..._univerjs_core.Rectangle.subtractMulti([targetRange], overwrittenRows), ...additions]);
 };
 const handleMoveCols = (params, targetRange) => {
 	const { fromRange, toRange } = params.params || {};
@@ -7160,12 +7243,7 @@ const handleMoveColsCommon = (params, targetRange) => {
 	const fromCol = fromRange.startColumn;
 	const count = fromRange.endColumn - fromRange.startColumn + 1;
 	const toCol = toRange.startColumn;
-	const matrix = new _univerjs_core.ObjectMatrix();
-	_univerjs_core.Range.foreach(targetRange, (row, col) => {
-		matrix.setValue(row, col, 1);
-	});
-	matrix.moveColumns(fromCol, count, toCol);
-	return (0, _univerjs_core.queryObjectMatrix)(matrix, (value) => value === 1);
+	return moveRangeAlongAxis(targetRange, fromCol, count, toCol, false);
 };
 const handleMoveRange = (param, targetRange) => {
 	var _param$params, _param$params2;
@@ -7195,32 +7273,12 @@ const handleMoveRangeCommon = (param, targetRange) => {
 		const relativeRange = _univerjs_core.Rectangle.getRelativeRange(targetRange, fromRange);
 		return [_univerjs_core.Rectangle.getPositionRange(relativeRange, toRange)];
 	}
-	const matrix = new _univerjs_core.ObjectMatrix();
-	_univerjs_core.Range.foreach(targetRange, (row, col) => {
-		matrix.setValue(row, col, 1);
-	});
-	const fromMatrix = new _univerjs_core.ObjectMatrix();
-	const loopFromRange = (0, _univerjs_core.getIntersectRange)(fromRange, targetRange);
-	loopFromRange && _univerjs_core.Range.foreach(loopFromRange, (row, col) => {
-		if (matrix.getValue(row, col)) {
-			matrix.setValue(row, col, void 0);
-			fromMatrix.setValue(row, col, 1);
-		}
-	});
 	const columnOffset = toRange.startColumn - fromRange.startColumn;
 	const rowOffset = toRange.startRow - fromRange.startRow;
-	const loopToRange = {
-		startColumn: toRange.startColumn - columnOffset,
-		endColumn: toRange.endColumn - columnOffset,
-		startRow: toRange.startRow - rowOffset,
-		endRow: toRange.endRow - rowOffset
-	};
-	loopToRange && _univerjs_core.Range.foreach(loopToRange, (row, col) => {
-		const targetRow = row + rowOffset;
-		const targetCol = col + columnOffset;
-		matrix.setValue(targetRow, targetCol, fromMatrix.getValue(row, col) ?? 0);
-	});
-	return (0, _univerjs_core.queryObjectMatrix)(matrix, (value) => value === 1);
+	const movedRange = (0, _univerjs_core.getIntersectRange)(fromRange, targetRange);
+	const remainingRanges = _univerjs_core.Rectangle.subtractMulti([targetRange], [fromRange, toRange]);
+	const translatedRanges = movedRange ? [translateRange(movedRange, rowOffset, columnOffset)] : [];
+	return mergeAndSortRanges([...remainingRanges, ...translatedRanges]);
 };
 const handleBaseRemoveRange = (_removeRange, _targetRange) => {
 	const removeRange = handleRangeTypeInput(_removeRange);
@@ -7430,16 +7488,7 @@ const handleInsertRangeMoveDownCommon = (param, targetRange) => {
 	const noMoveRanges = _univerjs_core.Rectangle.subtract(targetRange, bottomRange);
 	const targetMoveRange = (0, _univerjs_core.getIntersectRange)(bottomRange, targetRange);
 	if (!targetMoveRange) return [targetRange];
-	const matrix = new _univerjs_core.ObjectMatrix();
-	noMoveRanges.forEach((noMoveRange) => {
-		_univerjs_core.Range.foreach(noMoveRange, (row, col) => {
-			matrix.setValue(row, col, 1);
-		});
-	});
-	targetMoveRange && _univerjs_core.Range.foreach(targetMoveRange, (row, col) => {
-		matrix.setValue(row + moveCount, col, 1);
-	});
-	return (0, _univerjs_core.queryObjectMatrix)(matrix, (v) => v === 1);
+	return sortRanges([...noMoveRanges, translateRange(targetMoveRange, moveCount, 0)]);
 };
 const handleInsertRangeMoveRight = (param, targetRange) => {
 	var _param$params11;
@@ -7467,16 +7516,7 @@ const handleInsertRangeMoveRightCommon = (param, targetRange) => {
 	const noMoveRanges = _univerjs_core.Rectangle.subtract(targetRange, bottomRange);
 	const targetMoveRange = (0, _univerjs_core.getIntersectRange)(bottomRange, targetRange);
 	if (!targetMoveRange) return [targetRange];
-	const matrix = new _univerjs_core.ObjectMatrix();
-	noMoveRanges.forEach((noMoveRange) => {
-		_univerjs_core.Range.foreach(noMoveRange, (row, col) => {
-			matrix.setValue(row, col, 1);
-		});
-	});
-	targetMoveRange && _univerjs_core.Range.foreach(targetMoveRange, (row, col) => {
-		matrix.setValue(row, col + moveCount, 1);
-	});
-	return (0, _univerjs_core.queryObjectMatrix)(matrix, (v) => v === 1);
+	return sortRanges([...noMoveRanges, translateRange(targetMoveRange, 0, moveCount)]);
 };
 const handleDeleteRangeMoveLeft = (param, targetRange) => {
 	var _param$params13;
@@ -7506,23 +7546,11 @@ const handleDeleteRangeMoveLeftCommon = (param, targetRange) => {
 		endColumn: Number.POSITIVE_INFINITY
 	};
 	const moveCount = range.endColumn - range.startColumn + 1;
-	const targetDeleteRange = (0, _univerjs_core.getIntersectRange)(range, targetRange);
 	const noMoveRanges = _univerjs_core.Rectangle.subtract(targetRange, rightRange);
 	const targetMoveRange = (0, _univerjs_core.getIntersectRange)(rightRange, targetRange);
-	if (!targetDeleteRange && !targetMoveRange) return [targetRange];
-	const matrix = new _univerjs_core.ObjectMatrix();
-	targetMoveRange && _univerjs_core.Range.foreach(targetMoveRange, (row, col) => {
-		matrix.setValue(row, col - moveCount, 1);
-	});
-	targetDeleteRange && _univerjs_core.Range.foreach(targetDeleteRange, (row, col) => {
-		matrix.setValue(row, col - moveCount, 0);
-	});
-	noMoveRanges.forEach((noMoveRange) => {
-		_univerjs_core.Range.foreach(noMoveRange, (row, col) => {
-			matrix.setValue(row, col, 1);
-		});
-	});
-	return (0, _univerjs_core.queryObjectMatrix)(matrix, (v) => v === 1);
+	if (!targetMoveRange) return [targetRange];
+	const movedRanges = targetMoveRange ? _univerjs_core.Rectangle.subtract(targetMoveRange, range).map((target) => translateRange(target, 0, -moveCount)) : [];
+	return mergeAndSortRanges([...noMoveRanges, ...movedRanges]);
 };
 const handleDeleteRangeMoveUp = (param, targetRange) => {
 	var _param$params15;
@@ -7551,23 +7579,11 @@ const handleDeleteRangeMoveUpCommon = (param, targetRange) => {
 		endRow: Number.POSITIVE_INFINITY
 	};
 	const moveCount = range.endRow - range.startRow + 1;
-	const targetDeleteRange = (0, _univerjs_core.getIntersectRange)(range, targetRange);
 	const noMoveRanges = _univerjs_core.Rectangle.subtract(targetRange, bottomRange);
 	const targetMoveRange = (0, _univerjs_core.getIntersectRange)(bottomRange, targetRange);
-	if (!targetDeleteRange && !targetMoveRange) return [targetRange];
-	const matrix = new _univerjs_core.ObjectMatrix();
-	targetMoveRange && _univerjs_core.Range.foreach(targetMoveRange, (row, col) => {
-		matrix.setValue(row - moveCount, col, 1);
-	});
-	targetDeleteRange && _univerjs_core.Range.foreach(targetDeleteRange, (row, col) => {
-		matrix.setValue(row - moveCount, col, 0);
-	});
-	noMoveRanges.forEach((noMoveRange) => {
-		_univerjs_core.Range.foreach(noMoveRange, (row, col) => {
-			matrix.setValue(row, col, 1);
-		});
-	});
-	return (0, _univerjs_core.queryObjectMatrix)(matrix, (v) => v === 1);
+	if (!targetMoveRange) return [targetRange];
+	const movedRanges = targetMoveRange ? _univerjs_core.Rectangle.subtract(targetMoveRange, range).map((target) => translateRange(target, -moveCount, 0)) : [];
+	return mergeAndSortRanges([...noMoveRanges, ...movedRanges]);
 };
 const handleRemoveRowCommon = (param, targetRange) => {
 	const mergedRemoved = (0, _univerjs_core.mergeIntervals)((param.ranges ?? [param.range]).map((range) => [range.startRow, range.endRow]));
@@ -13897,7 +13913,7 @@ const SetFrozenCommand = {
 		if (!target) return false;
 		const { unitId, subUnitId, worksheet } = target;
 		const { startColumn, startRow, xSplit, ySplit } = params;
-		if (startRow >= worksheet.getRowCount() || startColumn >= worksheet.getColumnCount() || xSplit >= worksheet.getColumnCount() || ySplit >= worksheet.getRowCount()) return false;
+		if (!Number.isInteger(startRow) || !Number.isInteger(startColumn) || !Number.isInteger(xSplit) || !Number.isInteger(ySplit) || xSplit < 0 || ySplit < 0 || startRow >= worksheet.getRowCount() || startColumn >= worksheet.getColumnCount() || xSplit >= worksheet.getColumnCount() || ySplit >= worksheet.getRowCount()) return false;
 		const redoMutationParams = {
 			unitId,
 			subUnitId,
@@ -16937,18 +16953,26 @@ const TextToNumberCommand = {
 		const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
 		const { worksheet, unitId, subUnitId } = target;
 		const newCellValue = new _univerjs_core.ObjectMatrix();
+		const setNumfmtCells = [];
 		const removeNumfmtRanges = [];
 		for (let i = 0; i < ranges.length; i++) for (let r = ranges[i].startRow; r <= ranges[i].endRow; r++) for (let c = ranges[i].startColumn; c <= ranges[i].endColumn; c++) {
 			var _worksheet$getStyleDa, _cell$s;
 			if (newCellValue.getValue(r, c)) continue;
 			const cell = worksheet.getCellRaw(r, c);
 			const pattern = typeof (cell === null || cell === void 0 ? void 0 : cell.s) === "string" ? (_worksheet$getStyleDa = worksheet.getStyleDataByHash(cell.s)) === null || _worksheet$getStyleDa === void 0 || (_worksheet$getStyleDa = _worksheet$getStyleDa.n) === null || _worksheet$getStyleDa === void 0 ? void 0 : _worksheet$getStyleDa.pattern : cell === null || cell === void 0 || (_cell$s = cell.s) === null || _cell$s === void 0 || (_cell$s = _cell$s.n) === null || _cell$s === void 0 ? void 0 : _cell$s.pattern;
-			if (cell && cell.v && (cell.t !== _univerjs_core.CellValueType.NUMBER || (0, _univerjs_core.isTextFormat)(pattern)) && (0, _univerjs_core.isRealNum)(cell.v)) {
+			const parsedValue = typeof (cell === null || cell === void 0 ? void 0 : cell.v) === "string" ? (0, _univerjs_core.getNumfmtParseValueFilter)(cell.v) : null;
+			const numberValue = (0, _univerjs_core.isRealNum)(cell === null || cell === void 0 ? void 0 : cell.v) ? Number(cell === null || cell === void 0 ? void 0 : cell.v) : typeof (parsedValue === null || parsedValue === void 0 ? void 0 : parsedValue.v) === "number" ? parsedValue.v : null;
+			if (cell && cell.v && (cell.t !== _univerjs_core.CellValueType.NUMBER || (0, _univerjs_core.isTextFormat)(pattern)) && numberValue !== null) {
 				newCellValue.setValue(r, c, {
-					v: Number(cell.v),
+					v: numberValue,
 					t: _univerjs_core.CellValueType.NUMBER
 				});
-				if ((0, _univerjs_core.isTextFormat)(pattern)) removeNumfmtRanges.push({
+				if ((parsedValue === null || parsedValue === void 0 ? void 0 : parsedValue.z) && (!pattern || (0, _univerjs_core.isTextFormat)(pattern))) setNumfmtCells.push({
+					pattern: parsedValue.z,
+					row: r,
+					col: c
+				});
+				else if ((0, _univerjs_core.isTextFormat)(pattern)) removeNumfmtRanges.push({
 					startRow: r,
 					endRow: r,
 					startColumn: c,
@@ -16969,6 +16993,14 @@ const TextToNumberCommand = {
 			id: SetRangeValuesMutation.id,
 			params: SetRangeValuesUndoMutationFactory(accessor, setRangeValuesMutationParams)
 		}];
+		if (setNumfmtCells.length) {
+			const setNumfmtMutationParams = transformCellsToRange(unitId, subUnitId, setNumfmtCells);
+			redos.push({
+				id: SetNumfmtMutation.id,
+				params: setNumfmtMutationParams
+			});
+			undos.push(...factorySetNumfmtUndoMutation(accessor, setNumfmtMutationParams));
+		}
 		if (removeNumfmtRanges.length) {
 			const removeNumfmtMutationParams = {
 				unitId,
@@ -18186,6 +18218,19 @@ let SheetPermissionCheckController = class SheetPermissionCheckController extend
 				}, params.unitId, params.localSheetId);
 				errorMsg = this._localeService.t("sheets.permission.dialog.editErr");
 				break;
+			case TextToNumberCommand.id:
+				params = commandInfo.params;
+				permission = this.permissionCheckWithRanges({
+					workbookTypes: [WorkbookEditablePermission],
+					worksheetTypes: [
+						WorksheetSetCellValuePermission,
+						WorksheetSetCellStylePermission,
+						WorksheetEditPermission
+					],
+					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);
@@ -19325,7 +19370,7 @@ RangeProtectionCache = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets";
-var version = "1.0.0-beta.0";
+var version = "1.0.0-beta.2";
 
 //#endregion
 //#region src/controllers/active-worksheet.controller.ts

package/lib/cjs/locale/ar-SA.js

@@ -43,8 +43,7 @@ const locale = { sheets: {
 		title: "سيؤدي الاستمرار في الدمج إلى الاحتفاظ بقيمة الخلية العلوية اليسرى فقط، وسيتم تجاهل القيم الأخرى. هل أنت متأكد من الاستمرار؟",
 		cancel: "إلغاء الدمج",
 		confirm: "الاستمرار في الدمج",
-		warning: "تحذير",
-		dismantleMergeCellWarning: "سيؤدي هذا إلى تقسيم بعض الخلايا المدمجة. هل تريد الاستمرار؟"
+		warning: "تحذير"
 	} }
 } };
 

package/lib/cjs/locale/ca-ES.js

@@ -25,11 +25,11 @@ const locale = { sheets: {
 		editErr: "L'interval està protegit i no teniu permís d'edició. Per editar, contacteu amb el creador.",
 		formulaErr: "L'interval o l'interval referenciat està protegit, i no teniu permís d'edició. Per editar, contacteu amb el creador.",
 		insertOrDeleteMoveRangeErr: "L'interval inserit o suprimit s'interseca amb l'interval protegit, i aquesta operació no és compatible per ara.",
-		insertRowColErr: "L'interval está protegido y no tienes permiso para insertar filas y columnas. Para insertar filas y columnas, contacta con el creador.",
+		insertRowColErr: "L'interval està protegit i no teniu permís per inserir files i columnes. Per inserir files i columnes, contacteu amb el creador.",
 		moveRangeErr: "L'interval està protegit i no teniu permís per moure la selecció. Per moure la selecció, contacteu amb el creador.",
 		moveRowColErr: "L'interval està protegit i no teniu permís per moure files i columnes. Per moure files i columnes, contacteu amb el creador.",
 		operatorSheetErr: "El full de càlcul està protegit i no teniu permís per operar-hi. Per operar al full de càlcul, contacteu amb el creador.",
-		removeRowColErr: "L'interval está protegido y no tienes permiso para eliminar filas y columnas. Para eliminar filas y columnas, contacta con el creador.",
+		removeRowColErr: "L'interval està protegit i no teniu permís per suprimir files i columnes. Per suprimir files i columnes, contacteu amb el creador.",
 		setRowColStyleErr: "L'interval està protegit i no teniu permís per establir estils de fila i columna. Per establir estils de fila i columna, contacteu amb el creador.",
 		setStyleErr: "L'interval està protegit i no teniu permís per establir estils. Per establir estils, contacteu amb el creador."
 	} },
@@ -43,8 +43,7 @@ const locale = { sheets: {
 		title: "Continuar la fusió només conservarà el valor de la cel·la superior esquerra, descartant els altres valors. Estàs segur de continuar?",
 		cancel: "Cancel·lar fusió",
 		confirm: "Continuar fusió",
-		warning: "Avís",
-		dismantleMergeCellWarning: "Això dividirà algunes cel·les fusionades. Vols continuar?"
+		warning: "Avís"
 	} }
 } };
 

package/lib/cjs/locale/de-DE.js

@@ -43,8 +43,7 @@ const locale = { sheets: {
 		title: "Beim Fortfahren mit dem Zusammenführen bleibt nur der Wert der oberen linken Zelle erhalten, andere Werte werden verworfen. Möchten Sie wirklich fortfahren?",
 		cancel: "Zusammenführen abbrechen",
 		confirm: "Zusammenführen fortsetzen",
-		warning: "Warnung",
-		dismantleMergeCellWarning: "Dadurch werden einige verbundene Zellen aufgeteilt. Möchten Sie fortfahren?"
+		warning: "Warnung"
 	} }
 } };
 

package/lib/cjs/locale/en-US.js

@@ -58,8 +58,7 @@ const locale = { sheets: {
 		title: "Continue merging would only keep the upper-left cell value, discard other values. Are you sure to continue?",
 		cancel: "Cancel merging",
 		confirm: "Continue merging",
-		warning: "Warning",
-		dismantleMergeCellWarning: "This will cause some merged cells to be split. Do you want to continue?"
+		warning: "Warning"
 	} }
 } };
 

package/lib/cjs/locale/es-ES.js

@@ -43,8 +43,7 @@ const locale = { sheets: {
 		title: "Continuar la fusión solo conservará el valor de la celda superior izquierda, descartando los otros valores. ¿Estás seguro de continuar?",
 		cancel: "Cancelar fusión",
 		confirm: "Continuar fusión",
-		warning: "Advertencia",
-		dismantleMergeCellWarning: "Esto dividirá algunas celdas fusionadas. ¿Quieres continuar?"
+		warning: "Advertencia"
 	} }
 } };
 

package/lib/cjs/locale/fa-IR.js

@@ -43,8 +43,7 @@ const locale = { sheets: {
 		title: "ادغام ادامه‌دار فقط مقدار سلول بالا-چپ را حفظ می‌کند و سایر مقادیر را حذف می‌کند. آیا مطمئن هستید که ادامه می‌دهید؟",
 		cancel: "لغو ادغام",
 		confirm: "ادغام ادامه‌دار",
-		warning: "هشدار",
-		dismantleMergeCellWarning: "این باعث تقسیم برخی سلول‌های ادغام‌شده می‌شود. آیا می‌خواهید ادامه دهید؟"
+		warning: "هشدار"
 	} }
 } };
 

package/lib/cjs/locale/fr-FR.js

@@ -43,8 +43,7 @@ const locale = { sheets: {
 		title: "Continuer la fusion ne conservera que la valeur de la cellule en haut à gauche, en supprimant les autres valeurs. Êtes-vous sûr de vouloir continuer ?",
 		cancel: "Annuler la fusion",
 		confirm: "Continuer la fusion",
-		warning: "Avertissement",
-		dismantleMergeCellWarning: "Cela divisera certaines cellules fusionnées. Voulez-vous continuer ?"
+		warning: "Avertissement"
 	} }
 } };
 

package/lib/cjs/locale/id-ID.js

@@ -43,8 +43,7 @@ const locale = { sheets: {
 		title: "Melanjutkan penggabungan hanya akan menyimpan nilai sel kiri atas, membuang nilai lainnya. Apakah Anda yakin ingin melanjutkan?",
 		cancel: "Batalkan penggabungan",
 		confirm: "Lanjutkan penggabungan",
-		warning: "Peringatan",
-		dismantleMergeCellWarning: "Ini akan menyebabkan beberapa sel gabungan terpisah. Apakah Anda ingin melanjutkan?"
+		warning: "Peringatan"
 	} }
 } };
 

package/lib/cjs/locale/it-IT.js

@@ -43,8 +43,7 @@ const locale = { sheets: {
 		title: "Continuando l'unione verrà mantenuto solo il valore della cella in alto a sinistra, scartando gli altri valori. Continuare?",
 		cancel: "Annulla unione",
 		confirm: "Continua unione",
-		warning: "Avviso",
-		dismantleMergeCellWarning: "Questo comporterà la divisione di alcune celle unite. Continuare?"
+		warning: "Avviso"
 	} }
 } };
 

package/lib/cjs/locale/ja-JP.js

@@ -43,8 +43,7 @@ const locale = { sheets: {
 		title: "結合を続行すると、左上のセルの値のみが保持され、他の値は破棄されます。続行しますか？",
 		cancel: "結合をキャンセル",
 		confirm: "結合を続行",
-		warning: "警告",
-		dismantleMergeCellWarning: "これにより、一部の結合セルが分割されます。続行しますか？"
+		warning: "警告"
 	} }
 } };
 

package/lib/cjs/locale/ko-KR.js

@@ -43,8 +43,7 @@ const locale = { sheets: {
 		title: "병합을 계속하면 왼쪽 상단 셀의 값만 유지되고 다른 값은 삭제됩니다. 계속하시겠습니까?",
 		cancel: "병합 취소",
 		confirm: "병합 계속",
-		warning: "경고",
-		dismantleMergeCellWarning: "일부 병합된 셀이 분할됩니다. 계속하시겠습니까?"
+		warning: "경고"
 	} }
 } };
 

package/lib/cjs/locale/pl-PL.js

@@ -43,8 +43,7 @@ const locale = { sheets: {
 		title: "Kontynuowanie scalania spowoduje zachowanie tylko wartości komórki w lewym górnym rogu, pozostałe wartości zostaną odrzucone. Czy na pewno chcesz kontynuować?",
 		cancel: "Anuluj scalanie",
 		confirm: "Kontynuuj scalanie",
-		warning: "Ostrzeżenie",
-		dismantleMergeCellWarning: "Spowoduje to rozdzielenie niektórych scalonych komórek. Czy chcesz kontynuować?"
+		warning: "Ostrzeżenie"
 	} }
 } };
 

package/lib/cjs/locale/pt-BR.js

@@ -43,8 +43,7 @@ const locale = { sheets: {
 		title: "Continuar a mesclagem manterá apenas o valor da célula superior esquerda, descartando os outros valores. Tem certeza de que deseja continuar?",
 		cancel: "Cancelar mesclagem",
 		confirm: "Continuar mesclagem",
-		warning: "Aviso",
-		dismantleMergeCellWarning: "Isso fará com que algumas células mescladas sejam divididas. Deseja continuar?"
+		warning: "Aviso"
 	} }
 } };
 

package/lib/cjs/locale/ru-RU.js

@@ -43,8 +43,7 @@ const locale = { sheets: {
 		title: "Продолжение объединения сохранит только значение верхней левой ячейки, остальные значения будут удалены. Вы уверены, что хотите продолжить?",
 		cancel: "Отменить объединение",
 		confirm: "Продолжить объединение",
-		warning: "Предупреждение",
-		dismantleMergeCellWarning: "Это приведет к разделению некоторых объединенных ячеек. Вы хотите продолжить?"
+		warning: "Предупреждение"
 	} }
 } };
 

package/lib/cjs/locale/sk-SK.js

@@ -25,11 +25,11 @@ const locale = { sheets: {
 		editErr: "Rozsah je chránený a nemáte oprávnenie na úpravy. Ak chcete upravovať, kontaktujte autora.",
 		formulaErr: "Rozsah alebo referenčný rozsah je chránený a nemáte oprávnenie na úpravu. Ak chcete upravovať, kontaktujte autora.",
 		insertOrDeleteMoveRangeErr: "Vložený alebo odstránený rozsah sa prekrýva s chráneným rozsahom a táto operácia zatiaľ nie je podporovaná.",
-		insertRowColErr: "Rozsah je chránený a nemáte oprávnění pro vkládání řádků a sloupců. Pokud chcete vkládat řádky a sloupce, kontaktujte autora.",
+		insertRowColErr: "Rozsah je chránený a nemáte oprávnenie vkladať riadky a stĺpce. Ak chcete vložiť riadky a stĺpce, kontaktujte autora.",
 		moveRangeErr: "Rozsah je chránený a nemáte oprávnenie presúvať výber. Ak chcete presúvať výber, kontaktujte autora.",
 		moveRowColErr: "Rozsah je chránený a nemáte oprávnenie presúvať riadky a stĺpce. Ak chcete presúvať riadky a stĺpce, kontaktujte autora.",
 		operatorSheetErr: "Hárok je chránený a nemáte oprávnenie pracovať s hárkom. Ak chcete pracovať s hárkom, kontaktujte autora.",
-		removeRowColErr: "Rozsah je chránený a nemáte oprávnění pro odstraňování řádků a sloupců. Pokud chcete odstraňovat řádky a sloupce, kontaktujte autora.",
+		removeRowColErr: "Rozsah je chránený a nemáte oprávnenie odstraňovať riadky a stĺpce. Ak chcete odstrániť riadky a stĺpce, kontaktujte autora.",
 		setRowColStyleErr: "Rozsah je chránený a nemáte oprávnenie nastavovať štýly riadkov a stĺpcov. Ak chcete nastavovať štýly riadkov a stĺpcov, kontaktujte autora.",
 		setStyleErr: "Rozsah je chránený a nemáte oprávnenie nastavovať štýly. Ak chcete nastavovať štýly, kontaktujte autora."
 	} },
@@ -43,8 +43,7 @@ const locale = { sheets: {
 		title: "Pokračovanie v zlúčení zachová iba hodnotu hornej ľavej bunky, ostatné hodnoty sa zahodia. Ste si istí, že chcete pokračovať?",
 		cancel: "Zrušiť zlúčenie",
 		confirm: "Pokračovať v zlúčení",
-		warning: "Varovanie",
-		dismantleMergeCellWarning: "To spôsobí rozdelenie niektorých zlúčených buniek. Chcete pokračovať?"
+		warning: "Varovanie"
 	} }
 } };
 

package/lib/cjs/locale/vi-VN.js

@@ -43,8 +43,7 @@ const locale = { sheets: {
 		title: "Tiếp tục hợp nhất chỉ giữ lại giá trị của ô trên cùng bên trái, loại bỏ các giá trị khác. Bạn có chắc chắn muốn tiếp tục không?",
 		cancel: "Hủy hợp nhất",
 		confirm: "Tiếp tục hợp nhất",
-		warning: "Cảnh báo",
-		dismantleMergeCellWarning: "Điều này sẽ khiến một số ô đã hợp nhất bị tách ra. Bạn có muốn tiếp tục không?"
+		warning: "Cảnh báo"
 	} }
 } };
 

package/lib/cjs/locale/zh-CN.js

@@ -43,8 +43,7 @@ const locale = { sheets: {
 		title: "继续合并将只保留左上角单元格的值，丢弃其他值。您确定要继续吗？",
 		cancel: "取消合并",
 		confirm: "继续合并",
-		warning: "警告",
-		dismantleMergeCellWarning: "这将导致一些合并单元格被拆分。您要继续吗？"
+		warning: "警告"
 	} }
 } };
 

package/lib/cjs/locale/zh-HK.js

@@ -43,8 +43,7 @@ const locale = { sheets: {
 		title: "繼續合併將只保留左上角儲存格的值，捨棄其他值。您確定要繼續嗎？",
 		cancel: "取消合併",
 		confirm: "繼續合併",
-		warning: "警告",
-		dismantleMergeCellWarning: "這將導致一些合併儲存格被拆分。您要繼續嗎？"
+		warning: "警告"
 	} }
 } };
 

package/lib/cjs/locale/zh-TW.js

@@ -43,8 +43,7 @@ const locale = { sheets: {
 		title: "繼續合併將只保留左上角儲存格的值，捨棄其他值。您確定要繼續嗎？",
 		cancel: "取消合併",
 		confirm: "繼續合併",
-		warning: "警告",
-		dismantleMergeCellWarning: "這將導致一些合併儲存格被拆分。您要繼續嗎？"
+		warning: "警告"
 	} }
 } };