From e3dc9ce992b4d409bbca4ad07dd5a6811f505bda Mon Sep 17 00:00:00 2001 From: Univer <68851825+DR-Univer@users.noreply.github.com> Date: Wed, 17 Apr 2024 20:38:18 +0800 Subject: [PATCH] fix(sheet): header hidden (#1954) --- examples/src/slides/main.ts | 2 ++ .../components/sheets/extensions/column-header-layout.ts | 2 +- .../src/components/sheets/extensions/row-header-layout.ts | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/examples/src/slides/main.ts b/examples/src/slides/main.ts index 8df416c77b..877b684499 100644 --- a/examples/src/slides/main.ts +++ b/examples/src/slides/main.ts @@ -21,6 +21,7 @@ import { UniverSlidesPlugin } from '@univerjs/slides'; import { UniverSlidesUIPlugin } from '@univerjs/slides-ui'; import { UniverUIPlugin } from '@univerjs/ui'; +import { UniverFormulaEnginePlugin } from '@univerjs/engine-formula'; import { DEFAULT_SLIDE_DATA } from '../data'; // univer @@ -31,6 +32,7 @@ const univer = new Univer({ // base-render univer.registerPlugin(UniverRenderEnginePlugin); +univer.registerPlugin(UniverFormulaEnginePlugin); univer.registerPlugin(UniverUIPlugin, { container: 'univer-container', header: true, diff --git a/packages/engine-render/src/components/sheets/extensions/column-header-layout.ts b/packages/engine-render/src/components/sheets/extensions/column-header-layout.ts index 2e7cf3fea5..90aa4f16d2 100644 --- a/packages/engine-render/src/components/sheets/extensions/column-header-layout.ts +++ b/packages/engine-render/src/components/sheets/extensions/column-header-layout.ts @@ -35,7 +35,7 @@ export class ColumnHeaderLayout extends SheetExtension { const { rowColumnSegment, columnHeaderHeight = 0 } = spreadsheetSkeleton; const { startColumn, endColumn } = rowColumnSegment; - if (!spreadsheetSkeleton) { + if (!spreadsheetSkeleton || columnHeaderHeight === 0) { return; } diff --git a/packages/engine-render/src/components/sheets/extensions/row-header-layout.ts b/packages/engine-render/src/components/sheets/extensions/row-header-layout.ts index 3bbd565e14..c2b613b606 100644 --- a/packages/engine-render/src/components/sheets/extensions/row-header-layout.ts +++ b/packages/engine-render/src/components/sheets/extensions/row-header-layout.ts @@ -31,9 +31,9 @@ export class RowHeaderLayout extends SheetExtension { override Z_INDEX = 10; override draw(ctx: UniverRenderingContext, parentScale: IScale, spreadsheetSkeleton: SpreadsheetSkeleton) { - const { rowColumnSegment, rowHeaderWidth = 0, columnHeaderHeight = 0 } = spreadsheetSkeleton; - const { startRow, endRow, startColumn, endColumn } = rowColumnSegment; - if (!spreadsheetSkeleton) { + const { rowColumnSegment, rowHeaderWidth = 0 } = spreadsheetSkeleton; + const { startRow, endRow } = rowColumnSegment; + if (!spreadsheetSkeleton || rowHeaderWidth === 0) { return; }