opensource/univer
3
0
Fork 0
mirror of https://github.com/dream-num/univer.git synced 2026-09-01 15:29:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(engine-render): fix the issue of background rendering misalignment when hiding the first row of merged cells (#5858)

Browse Source
This commit is contained in:
wpxp123456
2025-09-15 14:45:27 +08:00
committed by GitHub
parent ad3f67b682
commit 7d70db085f
3 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/engine-render/src/components/sheets/extensions/background.ts
+32 -4
View File
@@ -187,10 +187,38 @@ export class Background extends SheetExtension {
return true;
}
// getRowVisible can take a lot of time, sometimes over 20+ms, this return condition should put in the last.
const visibleRow = spreadsheetSkeleton.worksheet.getRowVisible(row);
const visibleCol = spreadsheetSkeleton.worksheet.getColVisible(col);
if (!visibleRow || !visibleCol) return true;
if (!isMerged && !isMergedMainCell) {
// getRowVisible can take a lot of time, sometimes over 20+ms, this return condition should put in the last.
const visibleRow = spreadsheetSkeleton.worksheet.getRowVisible(row);
if (!visibleRow) return true;
const visibleCol = spreadsheetSkeleton.worksheet.getColVisible(col);
if (!visibleCol) return true;
} else {
let isAllRowHidden = true;
for (let r = mergeInfo.startRow; r <= mergeInfo.endRow; r++) {
const visibleRow = spreadsheetSkeleton.worksheet.getRowVisible(r);
if (visibleRow) {
isAllRowHidden = false;
break;
}
}
if (isAllRowHidden) return true;
let isAllColHidden = true;
for (let c = mergeInfo.startColumn; c <= mergeInfo.endColumn; c++) {
const visibleCol = spreadsheetSkeleton.worksheet.getColVisible(c);
if (visibleCol) {
isAllColHidden = false;
break;
}
}
if (isAllColHidden) return true;
}
// precise is a workaround for windows, macOS does not have this issue.
const startXPrecise = fixLineWidthByScale(startX, scaleX);
packages/engine-render/src/components/sheets/extensions/border.ts
+3 -1
View File
@@ -106,8 +106,10 @@ export class Border extends SheetExtension {
if (!isMerged) {
const visibleRow = spreadsheetSkeleton.worksheet.getRowVisible(row);
if (!visibleRow) return true;
const visibleCol = spreadsheetSkeleton.worksheet.getColVisible(col);
if (!visibleRow || !visibleCol) return true;
if (!visibleCol) return true;
}
if (!this.isRenderDiffRangesByRow(mergeInfo.startRow, mergeInfo.endRow, diffRanges)) {
packages/engine-render/src/components/sheets/extensions/font.ts
+3 -1
View File
@@ -246,8 +246,10 @@ export class Font extends SheetExtension {
if (notInMergeRange) {
const visibleRow = spreadsheetSkeleton.worksheet.getRowVisible(row);
if (!visibleRow) return true;
const visibleCol = spreadsheetSkeleton.worksheet.getColVisible(col);
if (!visibleRow || !visibleCol) return true;
if (!visibleCol) return true;
} else {
let isAllRowHidden = true;