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: bg border return before getCell (#3623)
lumix2e7b201ab8a6
diff --git a/packages/core/src/sheets/span-model.ts b/packages/core/src/sheets/span-model.tsindex a2d6ced76e..b791fedabd 100644--- a/packages/core/src/sheets/span-model.ts+++ b/packages/core/src/sheets/span-model.ts@@ -14,27 +14,24 @@* limitations under the License.*/+import type { IRange } from './typedef';import { LRUMap, Rectangle, Tools } from '../shared';import { Disposable } from '../shared/lifecycle';import { RANGE_TYPE } from './typedef';-import type { IRange } from './typedef';-interface IMergeDataCache {- [key: string]: number;-}export class SpanModel extends Disposable {/*** @property Cache for RANGE_TYPE.NORMAL*/- private _cellCache: IMergeDataCache = {};+ private _cellCache: Map<number, Map<number, number>> = new Map();/*** @property Cache for RANGE_TYPE.ROW*/- private _rowCache: IMergeDataCache = {};+ private _rowCache: Map<number, number> = new Map();/*** @property Cache for RANGE_TYPE.COLUMN*/- private _columnCache: IMergeDataCache = {};+ private _columnCache: Map<number, number> = new Map();/*** @property Whether has RANGE_TYPE.ALL*/@@ -64,9 +61,9 @@ export class SpanModel extends Disposable {}private _clearCache() {- this._cellCache = {};- this._rowCache = {};- this._columnCache = {};+ this._cellCache.clear();+ this._rowCache.clear();+ this._columnCache.clear();this._hasAll = false;this._allIndex = -1;this._rangeMap.clear();@@ -102,16 +99,14 @@ export class SpanModel extends Disposable {private _createRowCache(range: IRange, index: number) {const { startRow, endRow } = range;for (let i = startRow; i <= endRow; i++) {- const key = `${i}`;- this._rowCache[key] = index;+ this._rowCache.set(i, index);}}private _createColumnCache(range: IRange, index: number) {const { startColumn, endColumn } = range;for (let i = startColumn; i <= endColumn; i++) {- const key = `${i}`;- this._columnCache[key] = index;+ this._columnCache.set(i, index);}}@@ -122,8 +117,13 @@ export class SpanModel extends Disposable {private _createCellCache(range: IRange, index: number) {for (let i = range.startRow; i <= range.endRow; i++) {+ let columnCache = this._cellCache.get(i);+ if (columnCache == null) {+ columnCache = new Map();+ this._cellCache.set(i, columnCache);+ }for (let j = range.startColumn; j <= range.endColumn; j++) {- this._cellCache[`${i}-${j}`] = index;+ columnCache.set(j, index);}}}@@ -273,17 +273,20 @@ export class SpanModel extends Disposable {if (this._hasAll) {return this._allIndex;}- const rowKey = `${row}`;- const columnKey = `${column}`;- if (this._rowCache[rowKey] !== undefined) {- return this._rowCache[rowKey];++ const rowValue = this._rowCache.get(row);+ if (rowValue !== undefined) {+ return rowValue;}- if (this._columnCache[columnKey] !== undefined) {- return this._columnCache[columnKey];++ const columnValue = this._columnCache.get(column);+ if (columnValue !== undefined) {+ return columnValue;}- const key = `${row}-${column}`;- if (this._cellCache[key] !== undefined) {- return this._cellCache[key];++ const cellValue = this._cellCache.get(row)?.get(column);+ if (cellValue !== undefined) {+ return cellValue;}return -1;}diff --git a/packages/engine-render/src/components/sheets/sheet-skeleton.ts b/packages/engine-render/src/components/sheets/sheet-skeleton.tsindex b9e356d0aa..6ee4af9260 100644--- a/packages/engine-render/src/components/sheets/sheet-skeleton.ts+++ b/packages/engine-render/src/components/sheets/sheet-skeleton.ts@@ -14,34 +14,6 @@* limitations under the License.*/-/* eslint-disable max-lines-per-function */-/* eslint-disable no-param-reassign */-import {- BooleanNumber,- BuildTextUtils,- CellValueType,- CustomRangeType,- DEFAULT_EMPTY_DOCUMENT_VALUE,- DEFAULT_STYLES,- DocumentDataModel,- extractPureTextFromCell,- getColorStyle,- HorizontalAlign,- IContextService,- Inject,- isCellCoverable,- isNullCell,- isWhiteColor,- LocaleService,- ObjectMatrix,- searchArray,- TextX,- Tools,- VerticalAlign,- WrapStrategy,-} from '@univerjs/core';-import { distinctUntilChanged, startWith } from 'rxjs';-import type {BorderStyleTypes,IBorderStyleData,@@ -71,6 +43,37 @@ import type {TextDirection,Worksheet,} from '@univerjs/core';+import type { IDocumentSkeletonColumn } from '../../basics/i-document-skeleton-cached';++import type { IBoundRectNoAngle, IViewportInfo } from '../../basics/vector2';+import type { BorderCache, IFontCacheItem, IStylesCache } from './interfaces';+/* eslint-disable max-lines-per-function */+/* eslint-disable no-param-reassign */+import {+ BooleanNumber,+ BuildTextUtils,+ CellValueType,+ CustomRangeType,+ DEFAULT_EMPTY_DOCUMENT_VALUE,+ DEFAULT_STYLES,+ DocumentDataModel,+ extractPureTextFromCell,+ getColorStyle,+ HorizontalAlign,+ IContextService,+ Inject,+ isCellCoverable,+ isNullCell,+ isWhiteColor,+ LocaleService,+ ObjectMatrix,+ searchArray,+ TextX,+ Tools,+ VerticalAlign,+ WrapStrategy,+} from '@univerjs/core';+import { distinctUntilChanged, startWith } from 'rxjs';import { BORDER_TYPE, COLOR_BLACK_RGB, MAXIMUM_ROW_HEIGHT } from '../../basics/const';import { getRotateOffsetAndFarthestHypotenuse } from '../../basics/draw';import { convertTextRotation, VERTICAL_ROTATE_ANGLE } from '../../basics/text-rotation';@@ -86,9 +89,6 @@ import { DocumentSkeleton } from '../docs/layout/doc-skeleton';import { columnIterator } from '../docs/layout/tools';import { DocumentViewModel } from '../docs/view-model/document-view-model';import { Skeleton } from '../skeleton';-import type { IDocumentSkeletonColumn } from '../../basics/i-document-skeleton-cached';-import type { IBoundRectNoAngle, IViewportInfo } from '../../basics/vector2';-import type { BorderCache, IFontCacheItem, IStylesCache } from './interfaces';function addLinkToDocumentModel(documentModel: DocumentDataModel, linkUrl: string, linkId: string): void {const body = documentModel.getBody()!;@@ -269,11 +269,11 @@ export class SpreadsheetSkeleton extends Skeleton {};/** A matrix to store if a (row, column) position has render cache. */- private _cellBgCacheMatrix = new ObjectMatrix<boolean>();- private _cellBorderCacheMatrix = new ObjectMatrix<boolean>();+ private _handleBgMatrix = new ObjectMatrix<boolean>();+ private _handleBorderMatrix = new ObjectMatrix<boolean>();+ private _handleFontMatrix = new ObjectMatrix<boolean>();private _showGridlines: BooleanNumber = BooleanNumber.TRUE;-private _marginTop: number = 0;private _marginLeft: number = 0;@@ -381,8 +381,8 @@ export class SpreadsheetSkeleton extends Skeleton {fontMatrix: new ObjectMatrix<IFontCacheItem>(),border: new ObjectMatrix<BorderCache>(),};- this._cellBgCacheMatrix.reset();- this._cellBorderCacheMatrix.reset();+ this._handleBgMatrix.reset();+ this._handleBorderMatrix.reset();this._overflowCache.reset();this._worksheetData = null as unknown as IWorksheetData;@@ -1730,8 +1730,8 @@ export class SpreadsheetSkeleton extends Skeleton {fontMatrix: new ObjectMatrix<IFontCacheItem>(),border: new ObjectMatrix<BorderCache>(),};- this._cellBgCacheMatrix.reset();- this._cellBorderCacheMatrix.reset();+ this._handleBgMatrix.reset();+ this._handleBorderMatrix.reset();this._overflowCache.reset();}@@ -1744,13 +1744,13 @@ export class SpreadsheetSkeleton extends Skeleton {mergeRange?: IRange;cacheItem?: ICacheItem;} | undefined) {+ const handledThisCell = Tools.isDefine(this._handleBorderMatrix.getValue(row, col));+ if (handledThisCell) return;// by default, style cache should includes border and background info.const cacheItem = options?.cacheItem || { bg: true, border: true };if (!cacheItem.border) return;- const handledThisCell = Tools.isDefine(this._cellBorderCacheMatrix.getValue(row, col));- if (handledThisCell) return;- this._cellBorderCacheMatrix.setValue(row, col, true);+ this._handleBorderMatrix.setValue(row, col, true);if (style && style.bd) {const mergeRange = options?.mergeRange;if (mergeRange) {@@ -1778,13 +1778,13 @@ export class SpreadsheetSkeleton extends Skeleton {mergeRange?: IRange;cacheItem?: ICacheItem;} | undefined) {+ const handledThisCell = Tools.isDefine(this._handleBgMatrix.getValue(row, col));+ if (handledThisCell) return;// by default, style cache should includes border and background info.const cacheItem = options?.cacheItem || { bg: true, border: true };if (!cacheItem.bg) return;- const handledThisCell = Tools.isDefine(this._cellBgCacheMatrix.getValue(row, col));- if (handledThisCell) return;- this._cellBgCacheMatrix.setValue(row, col, true);+ this._handleBgMatrix.setValue(row, col, true);if (style && style.bg && style.bg.rgb) {const rgb = style.bg.rgb;if (!this._stylesCache.background![rgb]) {@@ -1798,8 +1798,10 @@ export class SpreadsheetSkeleton extends Skeleton {}}- _setFontStylesCache(cell: Nullable<ICellData>, row: number, col: number) {+ _setFontStylesCache(row: number, col: number, cell: Nullable<ICellData>) {if (isNullCell(cell)) return;++ this._handleFontMatrix.setValue(row, col, true);if (this._stylesCache.fontMatrix.getValue(row, col)) return;const modelObject = this._getCellDocumentModel(cell, {@@ -1849,11 +1851,13 @@ export class SpreadsheetSkeleton extends Skeleton {return;}- /**- * TODO: DR-Univer getCellRaw for slide demo, the implementation approach will be changed in the future.- */- const cell = this.worksheet.getCell(row, col) || this.worksheet.getCellRaw(row, col);- if (!cell) return;+ const handledBgCell = Tools.isDefine(this._handleBgMatrix.getValue(row, col));+ const handledBorderCell = Tools.isDefine(this._handleBorderMatrix.getValue(row, col));++ // worksheet.getCell has significant performance overhead, if we had handled this cell then return first.+ if (handledBgCell && handledBorderCell) {+ return;+ }if (!options) {options = { cacheItem: { bg: true, border: true } };@@ -1877,10 +1881,11 @@ export class SpreadsheetSkeleton extends Skeleton {}}+ const cell = this.worksheet.getCell(row, col) || this.worksheet.getCellRaw(row, col);const style = this._styles.getStyleByCell(cell);this._setBgStylesCache(row, col, style, options);this._setBorderStylesCache(row, col, style, options);- this._setFontStylesCache(cell, row, col);+ this._setFontStylesCache(row, col, cell);}private _updateConfigAndGetDocumentModel(