Skip to content

Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.

fix(sheet): the first style of span is not set is merge to true (#3398)

VicKun6def773da061
diff --git a/packages/engine-render/src/components/sheets/sheet-skeleton.ts b/packages/engine-render/src/components/sheets/sheet-skeleton.ts
index dad555c86b..3222525ed3 100644
--- a/packages/engine-render/src/components/sheets/sheet-skeleton.ts
+++ b/packages/engine-render/src/components/sheets/sheet-skeleton.ts
@@ -2127,12 +2127,21 @@ export class SpreadsheetSkeleton extends Skeleton {
let mergeRow = row;
let mergeColumn = column;
if (mergeRange) {
- isMerged = true;
- isMergedMainCell = mergeRange.startRow === row && mergeRange.startColumn === column;
- newEndRow = mergeRange.endRow;
- newEndColumn = mergeRange.endColumn;
- mergeRow = mergeRange.startRow;
- mergeColumn = mergeRange.startColumn;
+ isMergedMainCell = (mergeRange.startRow === row && mergeRange.startColumn === column);
+ if (isMergedMainCell) {
+ // do not set to true, the code is not equal to the original code from: getCellInfoInMergeData
+ // isMerged = false;
+ newEndRow = mergeRange.endRow;
+ newEndColumn = mergeRange.endColumn;
+ mergeRow = mergeRange.startRow;
+ mergeColumn = mergeRange.startColumn;
+ } else if (row > mergeRange.startRow && row <= mergeRange.endRow && column > mergeRange.startColumn && column <= mergeRange.endColumn) {
+ isMerged = true;
+ newEndRow = mergeRange.endRow;
+ newEndColumn = mergeRange.endColumn;
+ mergeRow = mergeRange.startRow;
+ mergeColumn = mergeRange.startColumn;
+ }
}
return {