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
perf: render in viewrange not all model (#3637)
lumix7b1462bacc67
diff --git a/e2e/perf/scroll.spec.ts b/e2e/perf/scroll.spec.tsindex 5b8cce7bb8..ab638fc888 100644--- a/e2e/perf/scroll.spec.ts+++ b/e2e/perf/scroll.spec.ts@@ -133,6 +133,7 @@ async function measureFPS(page: Page, testDuration = 5, deltaX: number, deltaY:}const createTest = (title: string, sheetData: IJsonObject, minFpsValue: number, deltaX = 0, deltaY = 0) => {+ // Default Size Of browser: 1280x720 pixels. And default DPR is 1.test(title, async ({ page }) => {let port = 3000;if (!isCI) {diff --git a/e2e/visual-comparison/docs/docs-visual-comparison.spec.ts-snapshots/diff-default-doc-content-1-chromium-darwin.png b/e2e/visual-comparison/docs/docs-visual-comparison.spec.ts-snapshots/diff-default-doc-content-1-chromium-darwin.pngnew file mode 100644index 0000000000..6e833be5e7Binary files /dev/null and b/e2e/visual-comparison/docs/docs-visual-comparison.spec.ts-snapshots/diff-default-doc-content-1-chromium-darwin.png differdiff --git a/e2e/visual-comparison/sheet/sheets-visual-comparison.spec.ts-snapshots/diff-demo-sheet-content-1-chromium-darwin.png b/e2e/visual-comparison/sheet/sheets-visual-comparison.spec.ts-snapshots/diff-demo-sheet-content-1-chromium-darwin.pngnew file mode 100644index 0000000000..d1c05430c1Binary files /dev/null and b/e2e/visual-comparison/sheet/sheets-visual-comparison.spec.ts-snapshots/diff-demo-sheet-content-1-chromium-darwin.png differdiff --git a/eslint.config.js b/eslint.config.jsindex 2d91596110..8b6d56c0ba 100644--- a/eslint.config.js+++ b/eslint.config.js@@ -25,6 +25,9 @@ export default antfu({html: true,},rules: baseRules,+ ignores: [+ 'mockdata/**/*.json',+ ],}, {files: ['**/*.ts', '**/*.tsx'],ignores: [diff --git a/packages/engine-render/src/basics/draw.ts b/packages/engine-render/src/basics/draw.tsindex 267e167856..419ad14cdb 100644--- a/packages/engine-render/src/basics/draw.ts+++ b/packages/engine-render/src/basics/draw.ts@@ -15,11 +15,11 @@*/import type { IPosition } from '@univerjs/core';-import { BorderStyleTypes } from '@univerjs/core';-import type { UniverRenderingContext } from '../context';-import { BORDER_TYPE, ORIENTATION_TYPE } from './const';+import type { IDocumentSkeletonLine } from './i-document-skeleton-cached';+import { BorderStyleTypes } from '@univerjs/core';+import { BORDER_TYPE as BORDER_LTRB, ORIENTATION_TYPE } from './const';import { createCanvasElement } from './tools';import { Vector2 } from './vector2';@@ -61,28 +61,28 @@ export function getDevicePixelRatio(): number {* @param lineWidthBuffer Solving the problem of mitered corners in the drawing of borders thicker than 2 pixels, caused by the line segments being centered.* @param position border draw position*/-export function drawLineByBorderType(ctx: UniverRenderingContext, type: BORDER_TYPE, lineWidthBuffer: number, position: IPosition) {+export function drawLineByBorderType(ctx: UniverRenderingContext, type: BORDER_LTRB, lineWidthBuffer: number, position: IPosition) {let drawStartX = 0;let drawStartY = 0;let drawEndX = 0;let drawEndY = 0;const { startX, startY, endX, endY } = position;- if (type === BORDER_TYPE.TOP) {+ if (type === BORDER_LTRB.TOP) {drawStartX = startX - lineWidthBuffer;drawStartY = startY;drawEndX = endX + lineWidthBuffer;drawEndY = startY;- } else if (type === BORDER_TYPE.BOTTOM) {+ } else if (type === BORDER_LTRB.BOTTOM) {drawStartX = startX - lineWidthBuffer;drawStartY = endY;drawEndX = endX - lineWidthBuffer;drawEndY = endY;- } else if (type === BORDER_TYPE.LEFT) {+ } else if (type === BORDER_LTRB.LEFT) {drawStartX = startX;drawStartY = startY - lineWidthBuffer;drawEndX = startX;drawEndY = endY + lineWidthBuffer;- } else if (type === BORDER_TYPE.RIGHT) {+ } else if (type === BORDER_LTRB.RIGHT) {drawStartX = endX;drawStartY = startY - lineWidthBuffer;drawEndX = endX;@@ -97,42 +97,49 @@ export function drawLineByBorderType(ctx: UniverRenderingContext, type: BORDER_Tctx.stroke();}-export function drawDiagonalLineByBorderType(ctx: UniverRenderingContext, type: BORDER_TYPE, position: IPosition) {+export function drawDiagonalLineByBorderType(ctx: UniverRenderingContext, type: BORDER_LTRB, position: IPosition) {let drawStartX = 0;let drawStartY = 0;let drawEndX = 0;let drawEndY = 0;const { startX, startY, endX, endY } = position;- if (type === BORDER_TYPE.TL_BR) {- drawStartX = startX;- drawStartY = startY;- drawEndX = endX;- drawEndY = endY;- } else if (type === BORDER_TYPE.TL_BC) {- drawStartX = startX;- drawStartY = startY;- drawEndX = (startX + endX) / 2;- drawEndY = endY;- } else if (type === BORDER_TYPE.TL_MR) {- drawStartX = startX;- drawStartY = startY;- drawEndX = endX;- drawEndY = (startY + endY) / 2;- } else if (type === BORDER_TYPE.BL_TR) {- drawStartX = startX;- drawStartY = endY;- drawEndX = endX;- drawEndY = startY;- } else if (type === BORDER_TYPE.ML_TR) {- drawStartX = startX;- drawStartY = (startY + endY) / 2;- drawEndX = endX;- drawEndY = startY;- } else if (type === BORDER_TYPE.BC_TR) {- drawStartX = (startX + endX) / 2;- drawStartY = endY;- drawEndX = endX;- drawEndY = startY;+ switch (type) {+ case BORDER_LTRB.TL_BR:+ drawStartX = startX;+ drawStartY = startY;+ drawEndX = endX;+ drawEndY = endY;+ break;+ case BORDER_LTRB.TL_BC:+ drawStartX = startX;+ drawStartY = startY;+ drawEndX = (startX + endX) / 2;+ drawEndY = endY;+ break;+ case BORDER_LTRB.TL_MR:+ drawStartX = startX;+ drawStartY = startY;+ drawEndX = endX;+ drawEndY = (startY + endY) / 2;+ break;+ case BORDER_LTRB.BL_TR:+ drawStartX = startX;+ drawStartY = endY;+ drawEndX = endX;+ drawEndY = startY;+ break;+ case BORDER_LTRB.ML_TR:+ drawStartX = startX;+ drawStartY = (startY + endY) / 2;+ drawEndX = endX;+ drawEndY = startY;+ break;+ case BORDER_LTRB.BC_TR:+ drawStartX = (startX + endX) / 2;+ drawStartY = endY;+ drawEndX = endX;+ drawEndY = startY;+ break;}// ctx.clearRect(drawStartX - 1, drawStartY - 1, drawEndX - drawStartX + 2, drawEndY - drawStartY + 2);@@ -143,32 +150,37 @@ export function drawDiagonalLineByBorderType(ctx: UniverRenderingContext, type:ctx.stroke();}-export function clearLineByBorderType(ctx: UniverRenderingContext, type: BORDER_TYPE, position: IPosition) {+export function clearLineByBorderType(ctx: UniverRenderingContext, type: BORDER_LTRB, position: IPosition) {let drawStartX = 0;let drawStartY = 0;let drawEndX = 0;let drawEndY = 0;const { startX, startY, endX, endY } = position;- if (type === BORDER_TYPE.TOP) {- drawStartX = startX;- drawStartY = startY;- drawEndX = endX;- drawEndY = startY;- } else if (type === BORDER_TYPE.BOTTOM) {- drawStartX = startX;- drawStartY = endY;- drawEndX = endX;- drawEndY = endY;- } else if (type === BORDER_TYPE.LEFT) {- drawStartX = startX;- drawStartY = startY;- drawEndX = startX;- drawEndY = endY;- } else if (type === BORDER_TYPE.RIGHT) {- drawStartX = endX;- drawStartY = startY;- drawEndX = endX;- drawEndY = endY;+ switch (type) {+ case BORDER_LTRB.TOP:+ drawStartX = startX;+ drawStartY = startY;+ drawEndX = endX;+ drawEndY = startY;+ break;+ case BORDER_LTRB.BOTTOM:+ drawStartX = startX;+ drawStartY = endY;+ drawEndX = endX;+ drawEndY = endY;+ break;+ case BORDER_LTRB.LEFT:+ drawStartX = startX;+ drawStartY = startY;+ drawEndX = startX;+ drawEndY = endY;+ break;+ case BORDER_LTRB.RIGHT:+ drawStartX = endX;+ drawStartY = startY;+ drawEndX = endX;+ drawEndY = endY;+ break;}// ctx.beginPath();@@ -252,7 +264,7 @@ export function getRotateOrientation(angle: number) {}// rotate calculate logic https://www.processon.com/view/link/630df928f346fb0714c9c4ec-// eslint-disable-next-line max-lines-per-function+// eslint-disable-next-line max-lines-per-function, complexityexport function getRotateOffsetAndFarthestHypotenuse(lines: IDocumentSkeletonLine[],rectWidth: number,@@ -388,8 +400,7 @@ export function getRotateOffsetAndFarthestHypotenuse(/*** Align the resolution, an alignment needs to be done in special cases where the resolution is 1.5, 1.25, etc.- * @param pixelRatio devicePixelRatio- * @returns+ * @returns {left: number, top: number} offset*/export function getTranslateInSpreadContextWithPixelRatio() {const offset = 0.5 - getLineOffset();diff --git a/packages/engine-render/src/basics/tools.ts b/packages/engine-render/src/basics/tools.tsindex d1f514abc2..dec5e513ee 100644--- a/packages/engine-render/src/basics/tools.ts+++ b/packages/engine-render/src/basics/tools.ts@@ -845,7 +845,7 @@ export function expandRangeIfIntersects(mainRanges: IRange[], ranges: IRange[])return mainRanges.concat(intersects); // do not use [...mainRanges, ...intersects], because concat is slightly faster than spread}-export function clampRanges(range: IRange) {+export function clampRange(range: IRange) {return {startRow: Math.max(0, range.startRow),startColumn: Math.max(0, range.startColumn),diff --git a/packages/engine-render/src/components/docs/document.ts b/packages/engine-render/src/components/docs/document.tsindex 9e0a59945b..dd2087ed14 100644--- a/packages/engine-render/src/components/docs/document.ts+++ b/packages/engine-render/src/components/docs/document.ts@@ -14,11 +14,19 @@* limitations under the License.*/-import { CellValueType, HorizontalAlign, VerticalAlign, WrapStrategy } from '@univerjs/core';+import type { IDocumentRenderConfig, IScale, Nullable } from '@univerjs/core';+import type { IDocumentSkeletonGlyph, IDocumentSkeletonLine, IDocumentSkeletonPage, IDocumentSkeletonTable } from '../../basics/i-document-skeleton-cached';+import type { Transform } from '../../basics/transform';+import type { IBoundRectNoAngle, IViewportInfo } from '../../basics/vector2';+import type { UniverRenderingContext } from '../../context';+import type { Scene } from '../../scene';+import type { ComponentExtension, IExtensionConfig } from '../extension';+import type { IDocumentsConfig, IPageMarginLayout } from './doc-component';+import type { DocumentSkeleton } from './layout/doc-skeleton';+import { CellValueType, HorizontalAlign, VerticalAlign, WrapStrategy } from '@univerjs/core';import { Subject } from 'rxjs';-import type { IDocumentRenderConfig, IScale, Nullable } from '@univerjs/core';-import { BORDER_TYPE, drawLineByBorderType } from '../../basics';+import { BORDER_TYPE as BORDER_LTRB, drawLineByBorderType } from '../../basics';import { calculateRectRotate, getRotateOffsetAndFarthestHypotenuse } from '../../basics/draw';import { LineType } from '../../basics/i-document-skeleton-cached';import { VERTICAL_ROTATE_ANGLE } from '../../basics/text-rotation';@@ -28,14 +36,6 @@ import { DocumentsSpanAndLineExtensionRegistry } from '../extension';import { DocComponent } from './doc-component';import { DOCS_EXTENSION_TYPE } from './doc-extension';import { Liquid } from './liquid';-import type { IDocumentSkeletonGlyph, IDocumentSkeletonLine, IDocumentSkeletonPage, IDocumentSkeletonTable } from '../../basics/i-document-skeleton-cached';-import type { Transform } from '../../basics/transform';-import type { IBoundRectNoAngle, IViewportInfo } from '../../basics/vector2';-import type { UniverRenderingContext } from '../../context';-import type { Scene } from '../../scene';-import type { ComponentExtension, IExtensionConfig } from '../extension';-import type { IDocumentsConfig, IPageMarginLayout } from './doc-component';-import type { DocumentSkeleton } from './layout/doc-skeleton';import './extensions';export interface IPageRenderConfig {@@ -723,28 +723,28 @@ export class Documents extends DocComponent {x += marginLeft;y += marginTop;- drawLineByBorderType(ctx, BORDER_TYPE.LEFT, 0, {+ drawLineByBorderType(ctx, BORDER_LTRB.LEFT, 0, {startX: x,startY: y,endX: x + pageWidth,endY: y + pageHeight,});- drawLineByBorderType(ctx, BORDER_TYPE.TOP, 0, {+ drawLineByBorderType(ctx, BORDER_LTRB.TOP, 0, {startX: x,startY: y,endX: x + pageWidth,endY: y + pageHeight,});- drawLineByBorderType(ctx, BORDER_TYPE.RIGHT, 0, {+ drawLineByBorderType(ctx, BORDER_LTRB.RIGHT, 0, {startX: x,startY: y,endX: x + pageWidth,endY: y + pageHeight,});- drawLineByBorderType(ctx, BORDER_TYPE.BOTTOM, 0, {+ drawLineByBorderType(ctx, BORDER_LTRB.BOTTOM, 0, {startX: x,startY: y,endX: x + pageWidth,diff --git a/packages/engine-render/src/components/docs/extensions/border.ts b/packages/engine-render/src/components/docs/extensions/border.tsindex 75465e510e..040e56c396 100644--- a/packages/engine-render/src/components/docs/extensions/border.ts+++ b/packages/engine-render/src/components/docs/extensions/border.ts@@ -15,13 +15,13 @@*/import type { BorderStyleTypes, IBorderData, IBorderStyleData, IScale, Nullable } from '@univerjs/core';-import { getColorStyle } from '@univerjs/core';+import type { IDocumentSkeletonGlyph } from '../../../basics/i-document-skeleton-cached';-import { BORDER_TYPE, COLOR_BLACK_RGB, FIX_ONE_PIXEL_BLUR_OFFSET } from '../../../basics/const';+import type { UniverRenderingContext } from '../../../context';+import { getColorStyle } from '@univerjs/core';+import { BORDER_TYPE as BORDER_LTRB, COLOR_BLACK_RGB, FIX_ONE_PIXEL_BLUR_OFFSET } from '../../../basics/const';import { drawLineByBorderType, getLineWidth, setLineType } from '../../../basics/draw';-import type { IDocumentSkeletonGlyph } from '../../../basics/i-document-skeleton-cached';import { Vector2 } from '../../../basics/vector2';-import type { UniverRenderingContext } from '../../../context';import { DocumentsSpanAndLineExtensionRegistry } from '../../extension';import { docExtension } from '../doc-extension';@@ -85,7 +85,7 @@ export class Border extends docExtension {this._preBorderColor = color;}- drawLineByBorderType(ctx, type as BORDER_TYPE, (lineWidth - 1) / 2 / precisionScale, {+ drawLineByBorderType(ctx, type as BORDER_LTRB, (lineWidth - 1) / 2 / precisionScale, {startX: spanStartPoint.x,startY: spanStartPoint.y,endX: spanStartPoint.x + spanWidth,@@ -103,11 +103,11 @@ export class Border extends docExtension {private _createBorderCache(borderData: IBorderData) {const { t, b, l, r } = borderData;- const borderCache = new Map<BORDER_TYPE, Nullable<IBorderStyleData>>();- t && borderCache.set(BORDER_TYPE.TOP, t);- b && borderCache.set(BORDER_TYPE.BOTTOM, b);- l && borderCache.set(BORDER_TYPE.LEFT, l);- r && borderCache.set(BORDER_TYPE.RIGHT, r);+ const borderCache = new Map<BORDER_LTRB, Nullable<IBorderStyleData>>();+ t && borderCache.set(BORDER_LTRB.TOP, t);+ b && borderCache.set(BORDER_LTRB.BOTTOM, b);+ l && borderCache.set(BORDER_LTRB.LEFT, l);+ r && borderCache.set(BORDER_LTRB.RIGHT, r);return borderCache;}}diff --git a/packages/engine-render/src/components/sheets/constants.ts b/packages/engine-render/src/components/sheets/constants.tsnew file mode 100644index 0000000000..bb761c77f7--- /dev/null+++ b/packages/engine-render/src/components/sheets/constants.ts@@ -0,0 +1,22 @@+/**+ * Copyright 2023-present DreamNum Inc.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++export const BORDER_Z_INDEX = 50;+export const FONT_EXTENSION_Z_INDEX = 45;+export const BG_Z_INDEX = 21;+export const PRINTING_BG_Z_INDEX = 21;++export const EXPAND_SIZE_FOR_RENDER_OVERFLOW = 20;diff --git a/packages/engine-render/src/components/sheets/extensions/background.ts b/packages/engine-render/src/components/sheets/extensions/background.tsindex b44c36ba10..eab36dd9d6 100644--- a/packages/engine-render/src/components/sheets/extensions/background.ts+++ b/packages/engine-render/src/components/sheets/extensions/background.ts@@ -14,14 +14,15 @@* limitations under the License.*/-import type { IRange, IScale } from '@univerjs/core';-import { fixLineWidthByScale, getColor, inViewRanges } from '../../../basics/tools';-import { SpreadsheetExtensionRegistry } from '../../extension';-import { SheetExtension } from './sheet-extension';+import type { IRange, IScale, ISelectionCellWithMergeInfo, ObjectMatrix } from '@univerjs/core';import type { UniverRenderingContext } from '../../../context';import type { IDrawInfo } from '../../extension';import type { SpreadsheetSkeleton } from '../sheet-skeleton';import type { Spreadsheet } from '../spreadsheet';+import { Range } from '@univerjs/core';+import { fixLineWidthByScale, getColor, inViewRanges } from '../../../basics/tools';+import { SpreadsheetExtensionRegistry } from '../../extension';+import { SheetExtension } from './sheet-extension';const UNIQUE_KEY = 'DefaultBackgroundExtension';@@ -32,6 +33,18 @@ const UNIQUE_KEY = 'DefaultBackgroundExtension';const DOC_EXTENSION_Z_INDEX = 21;const PRINTING_Z_INDEX = 21;+interface IRenderBGContext {+ ctx: UniverRenderingContext;+ spreadsheetSkeleton: SpreadsheetSkeleton;+ backgroundPositions: ObjectMatrix<ISelectionCellWithMergeInfo>;+ checkOutOfViewBound: boolean;+ backgroundPaths: Path2D;+ scaleX: number;+ scaleY: number;+ viewRanges: IRange[];+ diffRanges: IRange[];+}+export class Background extends SheetExtension {override uKey = UNIQUE_KEY;@@ -51,9 +64,8 @@ export class Background extends SheetExtension {{ viewRanges, checkOutOfViewBound }: IDrawInfo) {const { stylesCache, worksheet, rowHeightAccumulation, columnTotalWidth, columnWidthAccumulation, rowTotalHeight } = spreadsheetSkeleton;- const { background: backgroundCache, backgroundPositions } = stylesCache;- if (!worksheet || !backgroundCache) return;-+ const { background: bgMatrixCacheByColor, backgroundPositions } = stylesCache;+ if (!worksheet || !bgMatrixCacheByColor) return;if (!rowHeightAccumulation ||!columnWidthAccumulation ||@@ -64,64 +76,93 @@ export class Background extends SheetExtension {}ctx.save();const { scaleX, scaleY } = ctx.getScale();-+ const renderBGContext = {+ ctx,+ backgroundPositions,+ scaleX,+ scaleY,+ checkOutOfViewBound,+ viewRanges,+ diffRanges,+ spreadsheetSkeleton,+ } as IRenderBGContext;const renderBGCore = (rgb: string) => {- ctx.beginPath();-- const bgColorMatrix = backgroundCache[rgb];+ const bgColorMatrix = bgMatrixCacheByColor[rgb];ctx.fillStyle = rgb || getColor([255, 255, 255])!;const backgroundPaths = new Path2D();- const renderBGByCell = (row: number, col: number) => {- if (!checkOutOfViewBound && !inViewRanges(viewRanges, row, col)) {- return true;- }-- const cellInfo = backgroundPositions?.getValue(row, col);- if (cellInfo == null) {- return true;- }-- let { startY, endY, startX, endX } = cellInfo;- const { isMerged, isMergedMainCell, mergeInfo } = cellInfo;- const mergeTo = diffRanges && diffRanges.length > 0 ? diffRanges : viewRanges;- const combineWithMergeRanges = mergeTo;- //expandRangeIfIntersects([...mergeTo], [mergeInfo]);-- // If curr cell is not in the viewrange (viewport + merged cells), exit early.- if (!inViewRanges(combineWithMergeRanges!, row, col)) {- return true;- }- // For merged cells, and the current cell is the top-left cell in the merged region.- if (isMergedMainCell) {- startY = mergeInfo.startY;- endY = mergeInfo.endY;- startX = mergeInfo.startX;- endX = mergeInfo.endX;- }-- // in merge range , but not top-left cell.- if (isMerged) 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;-- // precise is a workaround for windows, macOS does not have this issue.- const startXPrecise = fixLineWidthByScale(startX, scaleX);- const startYPrecise = fixLineWidthByScale(startY, scaleY);- const endXPrecise = fixLineWidthByScale(endX, scaleX);- const endYPrecise = fixLineWidthByScale(endY, scaleY);- backgroundPaths.rect(startXPrecise, startYPrecise, endXPrecise - startXPrecise, endYPrecise - startYPrecise);- };- bgColorMatrix.forValue(renderBGByCell);++ renderBGContext.backgroundPaths = backgroundPaths;+ ctx.beginPath();+ // bgColorMatrix.forValue(renderBGByCell);+ viewRanges.forEach((range) => {+ Range.foreach(range, (row, col) => {+ const bgConfig = bgColorMatrix.getValue(row, col);+ if (bgConfig) {+ this.renderBGByCell(renderBGContext, row, col);+ }+ });+ });ctx.fill(backgroundPaths);ctx.closePath();};- Object.keys(backgroundCache).forEach(renderBGCore);+ Object.keys(bgMatrixCacheByColor).forEach(renderBGCore);ctx.restore();}++ renderBGByCell(bgContext: IRenderBGContext, row: number, col: number) {+ const { spreadsheetSkeleton, backgroundPositions, backgroundPaths, scaleX, scaleY, viewRanges, diffRanges } = bgContext;+ // if (!checkOutOfViewBound && !inViewRanges(viewRanges, row, col)) {+ // return true;+ // }++ const cellInfo = backgroundPositions?.getValue(row, col);+ if (cellInfo == null) {+ return true;+ }++ let { startY, endY, startX, endX } = cellInfo;+ const { isMerged, isMergedMainCell, mergeInfo } = cellInfo;+ const renderRange = diffRanges && diffRanges.length > 0 ? diffRanges : viewRanges;++ // isMerged isMergedMainCell are mutually exclusive. isMerged true then isMergedMainCell false.+ if (isMerged) {+ startY = mergeInfo.startY;+ endY = mergeInfo.endY;+ startX = mergeInfo.startX;+ endX = mergeInfo.endX;+ }+ // For merged cells, and the current cell is the top-left cell in the merged region.+ if (isMergedMainCell) {+ startY = mergeInfo.startY;+ endY = mergeInfo.endY;+ startX = mergeInfo.startX;+ endX = mergeInfo.endX;+ }++ // in merge range , but not top-left cell.+ // if (isMerged) return true;++ // const combineWithMergeRanges = mergeTo;+ //expandRangeIfIntersects([...mergeTo], [mergeInfo]);++ // If curr cell is not in the viewrange (viewport + merged cells), exit early.+ if ((!isMerged && !isMergedMainCell) && !inViewRanges(renderRange!, row, col)) {+ 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;++ // precise is a workaround for windows, macOS does not have this issue.+ const startXPrecise = fixLineWidthByScale(startX, scaleX);+ const startYPrecise = fixLineWidthByScale(startY, scaleY);+ const endXPrecise = fixLineWidthByScale(endX, scaleX);+ const endYPrecise = fixLineWidthByScale(endY, scaleY);+ backgroundPaths.rect(startXPrecise, startYPrecise, endXPrecise - startXPrecise, endYPrecise - startYPrecise);+ };}SpreadsheetExtensionRegistry.add(Background);diff --git a/packages/engine-render/src/components/sheets/extensions/border.ts b/packages/engine-render/src/components/sheets/extensions/border.tsindex 429eb774d6..644083fe8d 100644--- a/packages/engine-render/src/components/sheets/extensions/border.ts+++ b/packages/engine-render/src/components/sheets/extensions/border.ts@@ -14,32 +14,45 @@* limitations under the License.*/-import { BorderStyleTypes } from '@univerjs/core';import type { IRange, IScale, ObjectMatrix } from '@univerjs/core';+import type { UniverRenderingContext } from '../../../context';-import { BORDER_TYPE, COLOR_BLACK_RGB, FIX_ONE_PIXEL_BLUR_OFFSET } from '../../../basics/const';+import type { IDrawInfo } from '../../extension';+import type { BorderCache, BorderCacheItem } from '../interfaces';+import type { SpreadsheetSkeleton } from '../sheet-skeleton';+import { BorderStyleTypes, Range } from '@univerjs/core';+import { BORDER_TYPE as BORDER_LTRB, COLOR_BLACK_RGB, FIX_ONE_PIXEL_BLUR_OFFSET } from '../../../basics/const';import { drawDiagonalLineByBorderType, drawLineByBorderType, getLineWidth, setLineType } from '../../../basics/draw';import { SpreadsheetExtensionRegistry } from '../../extension';import { SheetExtension } from './sheet-extension';-import type { UniverRenderingContext } from '../../../context';-import type { BorderCacheItem } from '../interfaces';-import type { SpreadsheetSkeleton } from '../sheet-skeleton';const UNIQUE_KEY = 'DefaultBorderExtension';-const BORDER_Z_INDEX = 50;+interface IRenderBorderContext {+ ctx: UniverRenderingContext;+ // border: BorderCacheItem;+ overflowCache: ObjectMatrix<IRange>;+ precisionScale: number;+ spreadsheetSkeleton: SpreadsheetSkeleton;+ diffRanges: IRange[];+ viewRanges: IRange[];+}+export class Border extends SheetExtension {override uKey = UNIQUE_KEY;override Z_INDEX = BORDER_Z_INDEX;- // eslint-disable-next-line max-lines-per-function+ preStyle: BorderStyleTypes;+ preColor: string;+override draw(ctx: UniverRenderingContext,_parentScale: IScale,spreadsheetSkeleton: SpreadsheetSkeleton,- diffRanges: IRange[]+ diffRanges: IRange[],+ { viewRanges }: IDrawInfo) {const { stylesCache, overflowCache, worksheet, rowHeightAccumulation, columnTotalWidth, columnWidthAccumulation, rowTotalHeight } = spreadsheetSkeleton;if (!worksheet) return;@@ -53,104 +66,110 @@ export class Border extends SheetExtension {}ctx.save();- let preStyle: BorderStyleTypes;- let preColor: string;-ctx.translateWithPrecisionRatio(FIX_ONE_PIXEL_BLUR_OFFSET, FIX_ONE_PIXEL_BLUR_OFFSET);const precisionScale = this._getScale(ctx.getScale());const { border } = stylesCache;+ if (!border) return;+ const renderBorderContext = {+ ctx,+ precisionScale,+ overflowCache,+ diffRanges,+ viewRanges,+ spreadsheetSkeleton,+ } as IRenderBorderContext;++ ctx.beginPath();+ viewRanges.forEach((range) => {+ Range.foreach(range, (row, col) => {+ const borderConfig = border!.getValue(row, col);+ if (borderConfig) {+ this.renderBorderByCell(renderBorderContext, row, col, borderConfig);+ }+ });+ });- border?.forValue((rowIndex, columnIndex, borderCaches) => {- if (!borderCaches) {- return true;- }+ ctx.closePath();+ ctx.restore();+ }- const cellInfo = spreadsheetSkeleton.getCellByIndexWithNoHeader(rowIndex, columnIndex);+ renderBorderByCell(renderBorderContext: IRenderBorderContext, row: number, col: number, borderCacheItem: BorderCache) {+ const { ctx, precisionScale, overflowCache, spreadsheetSkeleton, diffRanges } = renderBorderContext;- const { startY: cellStartY, endY: cellEndY, startX: cellStartX, endX: cellEndX } = cellInfo;- const { isMerged, isMergedMainCell, mergeInfo } = cellInfo;+ const cellInfo = spreadsheetSkeleton.getCellByIndexWithNoHeader(row, col);- if (!isMerged) {- const visibleRow = spreadsheetSkeleton.worksheet.getRowVisible(rowIndex);- const visibleCol = spreadsheetSkeleton.worksheet.getColVisible(columnIndex);- if (!visibleRow || !visibleCol) return true;- }+ const { startY: cellStartY, endY: cellEndY, startX: cellStartX, endX: cellEndX } = cellInfo;+ const { isMerged, isMergedMainCell, mergeInfo } = cellInfo;- if (!this.isRenderDiffRangesByRow(mergeInfo.startRow, mergeInfo.endRow, diffRanges)) {- return true;- }+ if (!isMerged) {+ const visibleRow = spreadsheetSkeleton.worksheet.getRowVisible(row);+ const visibleCol = spreadsheetSkeleton.worksheet.getColVisible(col);+ if (!visibleRow || !visibleCol) return true;+ }- for (const key in borderCaches) {- const { type, style, color } = borderCaches[key] as BorderCacheItem;+ if (!this.isRenderDiffRangesByRow(mergeInfo.startRow, mergeInfo.endRow, diffRanges)) {+ return true;+ }- if (style === BorderStyleTypes.NONE) {- continue;- }+ for (const key in borderCacheItem) {+ const { type, style, color } = borderCacheItem[key] as BorderCacheItem;- let startY = cellStartY;- let endY = cellEndY;- let startX = cellStartX;- let endX = cellEndX;-- if (type !== BORDER_TYPE.TOP && type !== BORDER_TYPE.BOTTOM && type !== BORDER_TYPE.LEFT && type !== BORDER_TYPE.RIGHT) {- if (isMerged) {- return true;- }-- if (isMergedMainCell) {- startY = mergeInfo.startY;- endY = mergeInfo.endY;- startX = mergeInfo.startX;- endX = mergeInfo.endX;- }- }+ if (style === BorderStyleTypes.NONE) {+ continue;+ }- const lineWidth = getLineWidth(style);+ let startY = cellStartY;+ let endY = cellEndY;+ let startX = cellStartX;+ let endX = cellEndX;- if (style !== preStyle) {- setLineType(ctx, style);- ctx.setLineWidthByPrecision(lineWidth);- preStyle = style;+ if (type !== BORDER_LTRB.TOP && type !== BORDER_LTRB.BOTTOM && type !== BORDER_LTRB.LEFT && type !== BORDER_LTRB.RIGHT) {+ if (isMerged) {+ return true;}- if (color !== preColor) {- ctx.strokeStyle = color || COLOR_BLACK_RGB;- preColor = color;+ if (isMergedMainCell) {+ startY = mergeInfo.startY;+ endY = mergeInfo.endY;+ startX = mergeInfo.startX;+ endX = mergeInfo.endX;}+ }- drawDiagonalLineByBorderType(ctx, type, {- startX,- startY,- endX,- endY,- });+ const lineWidth = getLineWidth(style);+ setLineType(ctx, style);+ ctx.setLineWidthByPrecision(lineWidth);+ ctx.strokeStyle = color || COLOR_BLACK_RGB;- if (this._getOverflowExclusion(overflowCache, type, rowIndex, columnIndex)) {- continue;- }+ drawDiagonalLineByBorderType(ctx, type, {+ startX,+ startY,+ endX,+ endY,+ });- drawLineByBorderType(ctx, type, (lineWidth - 1) / 2 / precisionScale, {- startX,- startY,- endX,- endY,- });+ if (this._getOverflowExclusion(overflowCache, type, row, col)) {+ continue;}- });- ctx.closePath();- ctx.restore();+ drawLineByBorderType(ctx, type, (lineWidth - 1) / 2 / precisionScale, {+ startX,+ startY,+ endX,+ endY,+ });+ }}private _getOverflowExclusion(overflowCache: ObjectMatrix<IRange>,- type: BORDER_TYPE,+ type: BORDER_LTRB,borderRow: number,borderColumn: number) {let isDraw = false;- if (type === BORDER_TYPE.TOP || type === BORDER_TYPE.BOTTOM) {+ if (type === BORDER_LTRB.TOP || type === BORDER_LTRB.BOTTOM) {return isDraw;}@@ -161,12 +180,12 @@ export class Border extends SheetExtension {rowArray.forEach((column) => {const rectangle = overflowCache.getValue(row, column)!;const { startColumn, endColumn } = rectangle;- if (type === BORDER_TYPE.LEFT && borderColumn > startColumn && borderColumn <= endColumn) {+ if (type === BORDER_LTRB.LEFT && borderColumn > startColumn && borderColumn <= endColumn) {isDraw = true;return false;}- if (type === BORDER_TYPE.RIGHT && borderColumn >= startColumn && borderColumn < endColumn) {+ if (type === BORDER_LTRB.RIGHT && borderColumn >= startColumn && borderColumn < endColumn) {isDraw = true;return false;}diff --git a/packages/engine-render/src/components/sheets/extensions/font.ts b/packages/engine-render/src/components/sheets/extensions/font.tsindex 2751bd018e..89b8842d94 100644--- a/packages/engine-render/src/components/sheets/extensions/font.ts+++ b/packages/engine-render/src/components/sheets/extensions/font.ts@@ -17,29 +17,45 @@/* eslint-disable max-lines-per-function *//* eslint-disable complexity */-import { HorizontalAlign, WrapStrategy } from '@univerjs/core';-import type { ICellDataForSheetInterceptor, IRange, IScale, ObjectMatrix } from '@univerjs/core';--import { FIX_ONE_PIXEL_BLUR_OFFSET } from '../../../basics';-import { VERTICAL_ROTATE_ANGLE } from '../../../basics/text-rotation';-import { expandRangeIfIntersects, inRowViewRanges, inViewRanges } from '../../../basics/tools';-import { SpreadsheetExtensionRegistry } from '../../extension';-import { getDocsSkeletonPageSize, type SpreadsheetSkeleton } from '../sheet-skeleton';-import { SheetExtension } from './sheet-extension';+import type { ICellDataForSheetInterceptor, IRange, IScale, Nullable, ObjectMatrix } from '@univerjs/core';import type { UniverRenderingContext } from '../../../context';import type { Documents } from '../../docs/document';import type { IDrawInfo } from '../../extension';import type { IFontCacheItem } from '../interfaces';import type { SheetComponent } from '../sheet-component';+import { HorizontalAlign, Range, WrapStrategy } from '@univerjs/core';+import { FIX_ONE_PIXEL_BLUR_OFFSET } from '../../../basics';+import { VERTICAL_ROTATE_ANGLE } from '../../../basics/text-rotation';+import { clampRange, inViewRanges } from '../../../basics/tools';+import { SpreadsheetExtensionRegistry } from '../../extension';+import { EXPAND_SIZE_FOR_RENDER_OVERFLOW, FONT_EXTENSION_Z_INDEX } from '../constants';+import { getDocsSkeletonPageSize, type SpreadsheetSkeleton } from '../sheet-skeleton';+import { SheetExtension } from './sheet-extension';const UNIQUE_KEY = 'DefaultFontExtension';-const EXTENSION_Z_INDEX = 45;+interface IRenderFontContext {+ ctx: UniverRenderingContext;+ scale: number;+ rowHeightAccumulation: number[];+ columnTotalWidth: number;+ columnWidthAccumulation: number[];+ rowTotalHeight: number;+ viewRanges: IRange[];+ checkOutOfViewBound: boolean;+ diffRanges: IRange[];+ spreadsheetSkeleton: SpreadsheetSkeleton;+ overflowRectangle: Nullable<IRange>;+ cellData: ICellDataForSheetInterceptor;+ startY: number;+ endY: number;+ startX: number;+ endX: number;+}export class Font extends SheetExtension {override uKey = UNIQUE_KEY;-- override Z_INDEX = EXTENSION_Z_INDEX;+ override Z_INDEX = FONT_EXTENSION_Z_INDEX;getDocuments() {const parent = this.parent as SheetComponent;@@ -53,7 +69,7 @@ export class Font extends SheetExtension {diffRanges: IRange[],moreBoundsInfo: IDrawInfo) {- const { stylesCache, overflowCache, worksheet } = spreadsheetSkeleton;+ const { stylesCache, worksheet } = spreadsheetSkeleton;const { fontMatrix } = stylesCache;if (!spreadsheetSkeleton || !worksheet || !fontMatrix) return;@@ -69,187 +85,194 @@ export class Font extends SheetExtension {return;}- ctx.save();const scale = this._getScale(parentScale);const { viewRanges = [], checkOutOfViewBound } = moreBoundsInfo;- const renderFontByCellMatrix = (rowIndex: number, columnIndex: number, docsConfig: IFontCacheItem) => {- if (!checkOutOfViewBound) {- if (!inViewRanges(viewRanges!, rowIndex, columnIndex)) {- return true;- }- }-- const cellInfo = spreadsheetSkeleton.getCellByIndexWithNoHeader(- rowIndex,- columnIndex- );- let { startY, endY, startX, endX } = cellInfo;- const { isMerged, isMergedMainCell, mergeInfo } = cellInfo;-- if (isMerged) {- return true;- } else {- const visibleRow = spreadsheetSkeleton.worksheet.getRowVisible(rowIndex);- const visibleCol = spreadsheetSkeleton.worksheet.getColVisible(columnIndex);- if (!visibleRow || !visibleCol) return true;- }+ const renderFontContext = {+ ctx,+ scale,+ rowHeightAccumulation,+ columnTotalWidth,+ columnWidthAccumulation,+ rowTotalHeight,+ viewRanges,+ checkOutOfViewBound: checkOutOfViewBound || true,+ diffRanges,+ spreadsheetSkeleton,+ } as IRenderFontContext;+ ctx.save();+ // fontMatrix.forValue((row: number, col: number, fontsConfig: IFontCacheItem) => {+ // this.renderFontByCellMatrix(renderFontContext, row, col, fontsConfig);+ // });+ viewRanges.forEach((range) => {+ range.startColumn -= EXPAND_SIZE_FOR_RENDER_OVERFLOW;+ range.endColumn += EXPAND_SIZE_FOR_RENDER_OVERFLOW;+ range = clampRange(range);+ Range.foreach(range, (row, col) => {+ this.renderFontEachCell(renderFontContext, row, col, fontMatrix);+ });+ });- // If the merged cell area intersects with the current viewRange,- // then merge it into the current viewRange.- // After the merge, the font extension within the current viewBounds- // also needs to be drawn once.- // But at this moment, we cannot assume that it is not within the viewRanges and exit, because there may still be horizontal overflow.- // At this moment, we can only exclude the cells that are not within the current row.+ ctx.restore();+ }- const mergeTo = diffRanges && diffRanges.length > 0 ? diffRanges : viewRanges;- const combineWithMergeRanges = expandRangeIfIntersects([...mergeTo], [mergeInfo]);- if (!inRowViewRanges(combineWithMergeRanges, rowIndex)) {- return true;+ clipTextOverflow(renderFontContext: IRenderFontContext, row: number, col: number, fontMatrix: ObjectMatrix<IFontCacheItem>) {+ const { ctx, scale, overflowRectangle, rowHeightAccumulation, columnWidthAccumulation, cellData } = renderFontContext;+ let { startX, endX, startY, endY } = renderFontContext;++ // https://github.com/dream-num/univer-pro/issues/334+ // When horizontal alignment is not set, the default alignment for rotation angles varies to accommodate overflow scenarios.+ const fontsConfig = fontMatrix.getValue(row, col)!;+ const { horizontalAlign, vertexAngle = 0, centerAngle = 0 } = fontsConfig;+ let horizontalAlignOverFlow = horizontalAlign;+ if (horizontalAlign === HorizontalAlign.UNSPECIFIED) {+ if (centerAngle === VERTICAL_ROTATE_ANGLE && vertexAngle === VERTICAL_ROTATE_ANGLE) {+ horizontalAlignOverFlow = HorizontalAlign.CENTER;+ } else if ((vertexAngle > 0 && vertexAngle !== VERTICAL_ROTATE_ANGLE) || vertexAngle === -VERTICAL_ROTATE_ANGLE) {+ horizontalAlignOverFlow = HorizontalAlign.RIGHT;}+ }- if (isMergedMainCell) {- startY = mergeInfo.startY;- endY = mergeInfo.endY;- startX = mergeInfo.startX;- endX = mergeInfo.endX;- }- /**- * Incremental content rendering for texture mapping- * If the diffRanges do not intersect with the startRow and endRow on the row, then exit early.- *- * If this cell is not within a merged region, the mergeInfo start and end values are just the cell itself.- */- if (diffRanges) {- if (!this.isRowInRanges(mergeInfo.startRow, mergeInfo.endRow, diffRanges)) {- return true;- }- }+ const rightOffset = cellData.fontRenderExtension?.rightOffset ?? 0;+ const leftOffset = cellData.fontRenderExtension?.leftOffset ?? 0;+ let isOverflow = true;- // If the cell is overflowing, but the overflowRectangle has not been set,- // then overflowRectangle is set to undefined.- const overflowRectangle = overflowCache.getValue(rowIndex, columnIndex);- const { horizontalAlign, vertexAngle = 0, centerAngle = 0 } = docsConfig;+ if (vertexAngle === 0) {+ startX = startX + leftOffset;+ endX = endX - rightOffset;- // If it's neither an overflow nor within the current range,- // then we can exit early (taking into account the range extension- // caused by the merged cells).- if (!overflowRectangle && !inViewRanges(combineWithMergeRanges, rowIndex, columnIndex)) {- return true;+ if (rightOffset !== 0 || leftOffset !== 0) {+ isOverflow = false;}+ }+ const cellWidth = endX - startX;+ const cellHeight = endY - startY;- /**- * https://github.com/dream-num/univer-pro/issues/334- * When horizontal alignment is not set, the default alignment for rotation angles varies to accommodate overflow scenarios.- */- let horizontalAlignOverFlow = horizontalAlign;- if (horizontalAlign === HorizontalAlign.UNSPECIFIED) {- if (centerAngle === VERTICAL_ROTATE_ANGLE && vertexAngle === VERTICAL_ROTATE_ANGLE) {- horizontalAlignOverFlow = HorizontalAlign.CENTER;- } else if ((vertexAngle > 0 && vertexAngle !== VERTICAL_ROTATE_ANGLE) || vertexAngle === -VERTICAL_ROTATE_ANGLE) {- horizontalAlignOverFlow = HorizontalAlign.RIGHT;+ /**+ * In scenarios with offsets, there is no need to respond to text overflow.+ */+ if (overflowRectangle && isOverflow) {+ const { startColumn, startRow, endColumn, endRow } = overflowRectangle;+ if (startColumn === endColumn && startColumn === col) {+ ctx.rectByPrecision(+ startX + 1 / scale,+ startY + 1 / scale,+ cellWidth - 2 / scale,+ cellHeight - 2 / scale+ );+ ctx.clip();+ } else {+ if (horizontalAlignOverFlow === HorizontalAlign.CENTER) {+ this._clipRectangleForOverflow(+ ctx,+ startRow,+ endRow,+ startColumn,+ endColumn,+ scale,+ rowHeightAccumulation,+ columnWidthAccumulation+ );+ } else if (horizontalAlignOverFlow === HorizontalAlign.RIGHT) {+ this._clipRectangleForOverflow(+ ctx,+ startRow,+ row,+ startColumn,+ col,+ scale,+ rowHeightAccumulation,+ columnWidthAccumulation+ );+ } else {+ this._clipRectangleForOverflow(+ ctx,+ row,+ endRow,+ col,+ endColumn,+ scale,+ rowHeightAccumulation,+ columnWidthAccumulation+ );}}+ } else {+ ctx.rectByPrecision(startX + 1 / scale, startY + 1 / scale, cellWidth - 2 / scale, cellHeight - 2 / scale);+ // for normal cell, forbid text overflow cellarea+ ctx.clip();+ }+ }- const cellData = worksheet.getCell(rowIndex, columnIndex) as ICellDataForSheetInterceptor || {};- if (cellData.fontRenderExtension?.isSkip) {- return true;- }-- ctx.save();- ctx.beginPath();+ renderFontEachCell(renderFontContext: IRenderFontContext, row: number, col: number, fontMatrix: ObjectMatrix<IFontCacheItem>) {+ const { ctx, viewRanges, diffRanges, spreadsheetSkeleton } = renderFontContext;- const rightOffset = cellData.fontRenderExtension?.rightOffset ?? 0;- const leftOffset = cellData.fontRenderExtension?.leftOffset ?? 0;- let isOverflow = true;+ //#region merged cell+ // const calcHeader = false;+ const cellInfo = spreadsheetSkeleton.getCellByIndexWithNoHeader(row, col);+ let { startY, endY, startX, endX } = cellInfo;+ const { isMerged, isMergedMainCell, mergeInfo } = cellInfo;- if (vertexAngle === 0) {- startX = startX + leftOffset;- endX = endX - rightOffset;+ // merged, but not primary cell, then skip. DO NOT RENDER AGAIN, or that would cause font blurry.+ if (isMerged && !isMergedMainCell) {+ return true;+ }- if (rightOffset !== 0 || leftOffset !== 0) {- isOverflow = false;- }+ // merged and primary cell+ if (isMergedMainCell) {+ startY = mergeInfo.startY;+ endY = mergeInfo.endY;+ startX = mergeInfo.startX;+ endX = mergeInfo.endX;+ }+ //#endregion++ const fontsConfig = fontMatrix.getValue(row, col);+ if (!fontsConfig) return true;++ //#region overflow+ // If the cell is overflowing, but the overflowRectangle has not been set,+ // then overflowRectangle is set to undefined.+ const overflowRange = spreadsheetSkeleton.overflowCache.getValue(row, col);++ // If it's neither an overflow nor within the current range,+ // then we can exit early+ const renderRange = diffRanges && diffRanges.length > 0 ? diffRanges : viewRanges;+ const notInMergeRange = !isMergedMainCell && !isMerged;+ if (!overflowRange && notInMergeRange) {+ if (!inViewRanges(renderRange, row, col)) {+ return true;}+ }+ //#endregion- const cellWidth = endX - startX;- const cellHeight = endY - startY;-- /**- * In scenarios with offsets, there is no need to respond to text overflow.- */- if (overflowRectangle && isOverflow) {- const { startColumn, startRow, endColumn, endRow } = overflowRectangle;- if (startColumn === endColumn && startColumn === columnIndex) {- ctx.rectByPrecision(- startX + 1 / scale,- startY + 1 / scale,- cellWidth - 2 / scale,- cellHeight - 2 / scale- );- ctx.clip();- // ctx.clearRectForTexture(- // startX + 1 / scale,- // startY + 1 / scale,- // cellWidth - 2 / scale,- // cellHeight - 2 / scale- // );- } else {- if (horizontalAlignOverFlow === HorizontalAlign.CENTER) {- this._clipRectangleForOverflow(- ctx,- startRow,- endRow,- startColumn,- endColumn,- scale,- rowHeightAccumulation,- columnWidthAccumulation- );- } else if (horizontalAlignOverFlow === HorizontalAlign.RIGHT) {- this._clipRectangleForOverflow(- ctx,- startRow,- rowIndex,- startColumn,- columnIndex,- scale,- rowHeightAccumulation,- columnWidthAccumulation- );- } else {- this._clipRectangleForOverflow(- ctx,- rowIndex,- endRow,- columnIndex,- endColumn,- scale,- rowHeightAccumulation,- columnWidthAccumulation- );- }- }- } else {- ctx.rectByPrecision(startX + 1 / scale, startY + 1 / scale, cellWidth - 2 / scale, cellHeight - 2 / scale);- // for normal cell, forbid text overflow cellarea- ctx.clip();- // ctx.clearRectForTexture(- // startX + 1 / scale,- // startY + 1 / scale,- // cellWidth - 2 / scale,- // cellHeight - 2 / scale- // );- }- ctx.translate(startX + FIX_ONE_PIXEL_BLUR_OFFSET, startY + FIX_ONE_PIXEL_BLUR_OFFSET);- this._renderDocuments(ctx, docsConfig, startX, startY, endX, endY, rowIndex, columnIndex, overflowCache);+ const visibleRow = spreadsheetSkeleton.worksheet.getRowVisible(row);+ const visibleCol = spreadsheetSkeleton.worksheet.getColVisible(col);+ if (!visibleRow || !visibleCol) return true;- ctx.closePath();- ctx.restore();- };+ const cellData = spreadsheetSkeleton.worksheet.getCell(row, col) as ICellDataForSheetInterceptor || {};+ if (cellData.fontRenderExtension?.isSkip) {+ return true;+ }- fontMatrix.forValue(renderFontByCellMatrix);+ ctx.save();+ ctx.beginPath();++ //#region text overflow+ renderFontContext.overflowRectangle = overflowRange;+ renderFontContext.cellData = cellData;+ renderFontContext.startX = startX;+ renderFontContext.startY = startY;+ renderFontContext.endX = endX;+ renderFontContext.endY = endY;+ this.clipTextOverflow(renderFontContext, row, col, fontMatrix);+ //#endregion++ ctx.translate(startX + FIX_ONE_PIXEL_BLUR_OFFSET, startY + FIX_ONE_PIXEL_BLUR_OFFSET);+ this._renderDocuments(ctx, fontsConfig, startX, startY, endX, endY, row, col, spreadsheetSkeleton.overflowCache);++ ctx.closePath();ctx.restore();- }+ };private _renderDocuments(ctx: UniverRenderingContext,diff --git a/packages/engine-render/src/components/sheets/interfaces.ts b/packages/engine-render/src/components/sheets/interfaces.tsindex 86ead765c5..ab3d213ec1 100644--- a/packages/engine-render/src/components/sheets/interfaces.ts+++ b/packages/engine-render/src/components/sheets/interfaces.ts@@ -23,7 +23,7 @@ import type {WrapStrategy,} from '@univerjs/core';-import type { BORDER_TYPE } from '../../basics/const';+import type { BORDER_TYPE as BORDER_LTRB } from '../../basics/const';import type { Canvas } from '../../canvas';import type { UniverRenderingContext } from '../../context';import type { DocumentSkeleton } from '../docs/layout/doc-skeleton';@@ -33,7 +33,7 @@ export interface BorderCache {}export interface BorderCacheItem {- type: BORDER_TYPE;+ type: BORDER_LTRB;style: BorderStyleTypes;color: string;}diff --git a/packages/engine-render/src/components/sheets/sheet-skeleton.ts b/packages/engine-render/src/components/sheets/sheet-skeleton.tsindex 6ee4af9260..81373fb02c 100644--- a/packages/engine-render/src/components/sheets/sheet-skeleton.ts+++ b/packages/engine-render/src/components/sheets/sheet-skeleton.ts@@ -74,7 +74,7 @@ import {WrapStrategy,} from '@univerjs/core';import { distinctUntilChanged, startWith } from 'rxjs';-import { BORDER_TYPE, COLOR_BLACK_RGB, MAXIMUM_ROW_HEIGHT } from '../../basics/const';+import { BORDER_TYPE as BORDER_LTRB, COLOR_BLACK_RGB, MAXIMUM_ROW_HEIGHT } from '../../basics/const';import { getRotateOffsetAndFarthestHypotenuse } from '../../basics/draw';import { convertTextRotation, VERTICAL_ROTATE_ANGLE } from '../../basics/text-rotation';import {@@ -1701,14 +1701,12 @@ export class SpreadsheetSkeleton extends Skeleton {}// Calculate the text length for overflow situations, focusing on the leftmost column within the visible range.- // for (let c = Math.max(startColumn - 20, 0); c < startColumn; c++) {for (let c = 0; c < startColumn; c++) {this._setStylesCache(r, c, { cacheItem: { bg: false, border: false } });}if (endColumn === 0) continue;// Calculate the text length for overflow situations, focusing on the rightmost column within the visible range.- // for (let c = endColumn + 1; c < Math.min(endColumn + 20, columnWidthAccumulation.length); c++) {for (let c = endColumn + 1; c < columnWidthAccumulation.length; c++) {this._setStylesCache(r, c, { cacheItem: { bg: false, border: false } });}@@ -1754,23 +1752,23 @@ export class SpreadsheetSkeleton extends Skeleton {if (style && style.bd) {const mergeRange = options?.mergeRange;if (mergeRange) {- this._setMergeBorderProps(BORDER_TYPE.TOP, this._stylesCache, mergeRange);- this._setMergeBorderProps(BORDER_TYPE.BOTTOM, this._stylesCache, mergeRange);- this._setMergeBorderProps(BORDER_TYPE.LEFT, this._stylesCache, mergeRange);- this._setMergeBorderProps(BORDER_TYPE.RIGHT, this._stylesCache, mergeRange);+ this._setMergeBorderProps(BORDER_LTRB.TOP, this._stylesCache, mergeRange);+ this._setMergeBorderProps(BORDER_LTRB.BOTTOM, this._stylesCache, mergeRange);+ this._setMergeBorderProps(BORDER_LTRB.LEFT, this._stylesCache, mergeRange);+ this._setMergeBorderProps(BORDER_LTRB.RIGHT, this._stylesCache, mergeRange);} else if (!this.intersectMergeRange(row, col)) {- this._setBorderProps(row, col, BORDER_TYPE.TOP, style, this._stylesCache);- this._setBorderProps(row, col, BORDER_TYPE.BOTTOM, style, this._stylesCache);- this._setBorderProps(row, col, BORDER_TYPE.LEFT, style, this._stylesCache);- this._setBorderProps(row, col, BORDER_TYPE.RIGHT, style, this._stylesCache);+ this._setBorderProps(row, col, BORDER_LTRB.TOP, style, this._stylesCache);+ this._setBorderProps(row, col, BORDER_LTRB.BOTTOM, style, this._stylesCache);+ this._setBorderProps(row, col, BORDER_LTRB.LEFT, style, this._stylesCache);+ this._setBorderProps(row, col, BORDER_LTRB.RIGHT, style, this._stylesCache);}- this._setBorderProps(row, col, BORDER_TYPE.TL_BR, style, this._stylesCache);- this._setBorderProps(row, col, BORDER_TYPE.TL_BC, style, this._stylesCache);- this._setBorderProps(row, col, BORDER_TYPE.TL_MR, style, this._stylesCache);- this._setBorderProps(row, col, BORDER_TYPE.BL_TR, style, this._stylesCache);- this._setBorderProps(row, col, BORDER_TYPE.ML_TR, style, this._stylesCache);- this._setBorderProps(row, col, BORDER_TYPE.BC_TR, style, this._stylesCache);+ this._setBorderProps(row, col, BORDER_LTRB.TL_BR, style, this._stylesCache);+ this._setBorderProps(row, col, BORDER_LTRB.TL_BC, style, this._stylesCache);+ this._setBorderProps(row, col, BORDER_LTRB.TL_MR, style, this._stylesCache);+ this._setBorderProps(row, col, BORDER_LTRB.BL_TR, style, this._stylesCache);+ this._setBorderProps(row, col, BORDER_LTRB.ML_TR, style, this._stylesCache);+ this._setBorderProps(row, col, BORDER_LTRB.BC_TR, style, this._stylesCache);}}@@ -1999,7 +1997,7 @@ export class SpreadsheetSkeleton extends Skeleton {* pro/issues/344* In Excel, for the border rendering of merged cells to take effect, the outermost cells need to have the same border style.*/- private _setMergeBorderProps(type: BORDER_TYPE, cache: IStylesCache, mergeRange: IRange): void {+ private _setMergeBorderProps(type: BORDER_LTRB, cache: IStylesCache, mergeRange: IRange): void {if (!this.worksheet || !cache.border) {return;}@@ -2014,32 +2012,32 @@ export class SpreadsheetSkeleton extends Skeleton {let column = mergeRange.startColumn;- if (type === BORDER_TYPE.TOP) {+ if (type === BORDER_LTRB.TOP) {row = mergeRange.startRow;forStart = mergeRange.startColumn;forEnd = mergeRange.endColumn;- } else if (type === BORDER_TYPE.BOTTOM) {+ } else if (type === BORDER_LTRB.BOTTOM) {row = mergeRange.endRow;forStart = mergeRange.startColumn;forEnd = mergeRange.endColumn;- } else if (type === BORDER_TYPE.LEFT) {+ } else if (type === BORDER_LTRB.LEFT) {column = mergeRange.startColumn;forStart = mergeRange.startRow;forEnd = mergeRange.endRow;- } else if (type === BORDER_TYPE.RIGHT) {+ } else if (type === BORDER_LTRB.RIGHT) {column = mergeRange.endColumn;forStart = mergeRange.startRow;forEnd = mergeRange.endRow;}for (let i = forStart; i <= forEnd; i++) {- if (type === BORDER_TYPE.TOP) {+ if (type === BORDER_LTRB.TOP) {column = i;- } else if (type === BORDER_TYPE.BOTTOM) {+ } else if (type === BORDER_LTRB.BOTTOM) {column = i;- } else if (type === BORDER_TYPE.LEFT) {+ } else if (type === BORDER_LTRB.LEFT) {row = i;- } else if (type === BORDER_TYPE.RIGHT) {+ } else if (type === BORDER_LTRB.RIGHT) {row = i;}@@ -2085,7 +2083,7 @@ export class SpreadsheetSkeleton extends Skeleton {}}- private _setBorderProps(r: number, c: number, type: BORDER_TYPE, style: IStyleData, cache: IStylesCache): void {+ private _setBorderProps(r: number, c: number, type: BORDER_LTRB, style: IStyleData, cache: IStylesCache): void {const props: Nullable<IBorderStyleData> = style.bd?.[type];if (!props || !cache.border) {return;@@ -2104,13 +2102,13 @@ export class SpreadsheetSkeleton extends Skeleton {* When the top border of a cell and the bottom border of the cell above it (r-1) overlap,* if the top border of cell r is white, then the rendering is ignored.*/- if (type === BORDER_TYPE.TOP) {- const borderBottom = borderCache.getValue(r - 1, c)?.[BORDER_TYPE.BOTTOM];+ if (type === BORDER_LTRB.TOP) {+ const borderBottom = borderCache.getValue(r - 1, c)?.[BORDER_LTRB.BOTTOM];if (borderBottom && isWhiteColor(rgb)) {return;}- } else if (type === BORDER_TYPE.LEFT) {- const borderRight = borderCache.getValue(r, c - 1)?.[BORDER_TYPE.RIGHT];+ } else if (type === BORDER_LTRB.LEFT) {+ const borderRight = borderCache.getValue(r, c - 1)?.[BORDER_LTRB.RIGHT];if (borderRight && isWhiteColor(rgb)) {return;}diff --git a/packages/engine-render/src/components/sheets/spreadsheet.ts b/packages/engine-render/src/components/sheets/spreadsheet.tsindex b50d33a8ec..0209ec19b3 100644--- a/packages/engine-render/src/components/sheets/spreadsheet.ts+++ b/packages/engine-render/src/components/sheets/spreadsheet.ts@@ -355,7 +355,7 @@ export class Spreadsheet extends SheetComponent {cacheCtx.restore();cacheCtx.save();- // 所以 cacheCtx.setTransform is rowHeaderWidth + viewport + scroll+ // cacheCtx.setTransform is rowHeaderWidth + viewport + scrollconst m = mainCtx.getTransform();// cacheCtx.setTransform(m.a, m.b, m.c, m.d, m.e, m.f);cacheCtx.setTransform(m.a, m.b, m.c, m.d, 0, 0);diff --git a/packages/engine-render/src/context.ts b/packages/engine-render/src/context.tsindex d50c982093..eef2d6d874 100644--- a/packages/engine-render/src/context.ts+++ b/packages/engine-render/src/context.ts@@ -14,6 +14,7 @@* limitations under the License.*/+import type { Nullable } from '@univerjs/core';import { Tools } from '@univerjs/core';import { fixLineWidthByScale, getColor } from './basics/tools';@@ -21,6 +22,7 @@ export class UniverRenderingContext2D implements CanvasRenderingContext2D {__mode = 'rendering';private _system: string;private _browser: string;+ private _transformCache: Nullable<DOMMatrix>;readonly canvas: HTMLCanvasElement;_context: CanvasRenderingContext2D;@@ -288,7 +290,8 @@ export class UniverRenderingContext2D implements CanvasRenderingContext2D {}private _getScale() {- const m = this.getTransform();+ const m = this._transformCache || this.getTransform();+ if (!this._transformCache && m) this._transformCache = m;return {scaleX: m.a,scaleY: m.d,@@ -346,6 +349,7 @@ export class UniverRenderingContext2D implements CanvasRenderingContext2D {}resetTransform() {+ this._transformCache = null;this._context.resetTransform();}@@ -360,6 +364,7 @@ export class UniverRenderingContext2D implements CanvasRenderingContext2D {* @method*/reset() {+ this._transformCache = null;this._context.reset();}@@ -895,6 +900,7 @@ export class UniverRenderingContext2D implements CanvasRenderingContext2D {setTransform(a: number, b: number, c: number, d: number, e: number, f: number): void;setTransform(...args: [any]) {+ this._transformCache = null;this._context.setTransform(...args);}@@ -939,6 +945,7 @@ export class UniverRenderingContext2D implements CanvasRenderingContext2D {*/transform(a: number, b: number, c: number, d: number, e: number, f: number) {this._context.transform(a, b, c, d, e, f);+ this._transformCache = null;}/**diff --git a/packages/sheets/src/commands/commands/set-border-command.ts b/packages/sheets/src/commands/commands/set-border-command.tsindex 93c80975c0..efca8bdee4 100644--- a/packages/sheets/src/commands/commands/set-border-command.ts+++ b/packages/sheets/src/commands/commands/set-border-command.ts@@ -14,16 +14,6 @@* limitations under the License.*/-import {- BorderType,- CommandType,- ICommandService,- IUndoRedoService,- IUniverInstanceService,- ObjectMatrix,- Tools,-} from '@univerjs/core';-import type {BorderStyleTypes,IAccessor,@@ -34,12 +24,22 @@ import type {IRange,IStyleData,} from '@univerjs/core';++import type { ISetRangeValuesMutationParams } from '../mutations/set-range-values.mutation';+import type { IResult } from './utils/target-util';+import {+ BorderType,+ CommandType,+ ICommandService,+ IUndoRedoService,+ IUniverInstanceService,+ ObjectMatrix,+ Tools,+} from '@univerjs/core';import { BorderStyleManagerService, type IBorderInfo } from '../../services/border-style-manager.service';import { SheetsSelectionsService } from '../../services/selections/selection-manager.service';import { SetRangeValuesMutation, SetRangeValuesUndoMutationFactory } from '../mutations/set-range-values.mutation';import { getSheetCommandTarget } from './utils/target-util';-import type { ISetRangeValuesMutationParams } from '../mutations/set-range-values.mutation';-import type { IResult } from './utils/target-util';function forEach(range: IRange, action: (row: number, column: number) => void): void {const { startRow, startColumn, endRow, endColumn } = range;