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.
TypeScript boardcollaborationdocdocxexceloffce365officepdfpptpptxpresentationsdksheetslidesspreadsheetuniverwordwordprocessorworkspacexlsx
fix: mixed policy in rendering cells in bg extension (#4048)
lumix2cdea3725dfa
diff --git a/packages/engine-render/src/components/sheets/extensions/background.ts b/packages/engine-render/src/components/sheets/extensions/background.tsindex a0f1430a47..4610a44367 100644--- a/packages/engine-render/src/components/sheets/extensions/background.ts+++ b/packages/engine-render/src/components/sheets/extensions/background.ts@@ -100,28 +100,39 @@ export class Background extends SheetExtension {const renderBGCore = (rgb: string) => {const bgColorMatrix = bgMatrixCacheByColor[rgb];+ const rangeForEachFn = (row: number, col: number, bgConfigParam?: string) => {+ const index = spreadsheetSkeleton.worksheet.getSpanModel().getMergeDataIndex(row, col);+ if (index !== -1) {+ return;+ }+ const cellInfo = spreadsheetSkeleton.getCellByIndexWithNoHeader(row, col);+ if (!cellInfo) return;+ const bgConfig = bgConfigParam || bgColorMatrix.getValue(row, col);+ if (bgConfig) {+ renderBGContext.cellInfo = cellInfo;+ this.renderBGByCell(renderBGContext, row, col);+ }+ };+ctx.fillStyle = rgb || getColor([255, 255, 255])!;const backgroundPaths = new Path2D();-renderBGContext.backgroundPaths = backgroundPaths;ctx.beginPath();- // Currently, viewRanges has only one range.- viewRanges.forEach((range) => {- Range.foreach(range, (row, col) => {- const index = spreadsheetSkeleton.worksheet.getSpanModel().getMergeDataIndex(row, col);- if (index !== -1) {- return;- }- const cellInfo = spreadsheetSkeleton.getCellByIndexWithNoHeader(row, col);- if (!cellInfo) return;- const bgConfig = bgColorMatrix.getValue(row, col);- if (bgConfig) {- renderBGContext.cellInfo = cellInfo;- this.renderBGByCell(renderBGContext, row, col);- }+ const matrixSize = bgColorMatrix.getSizeOf();+ const cellCountInRanges = viewRanges.reduce((sum, range) => {+ return sum + (range.endRow - range.startRow) * (range.endColumn - range.startColumn);+ }, 0);+ // if number of cells in range is over than bg config in matrix, renderBackground by matrix.+ // otherwise, renderBackground by cells in viewRange.+ if (cellCountInRanges < matrixSize) {+ // Currently, viewRanges has only one range.+ viewRanges.forEach((range) => {+ Range.foreach(range, rangeForEachFn);});- });+ } else {+ bgColorMatrix.forValue(rangeForEachFn);+ }ctx.fill(backgroundPaths);ctx.closePath();};@@ -145,10 +156,14 @@ export class Background extends SheetExtension {ctx.fill(backgroundPaths);ctx.closePath();};- Object.keys(bgMatrixCacheByColor).forEach((rgb) => {++ const rgbList = Object.keys(bgMatrixCacheByColor);++ for (let index = 0; index < rgbList.length; index++) {+ const rgb = rgbList[index];renderBGCore(rgb);renderBGForMergedCells(rgb);- });+ }ctx.restore();}