From 337af7daac84d9ff3c32e8a8ab91f307b5cce16a Mon Sep 17 00:00:00 2001 From: Ran Luo Date: Wed, 10 Apr 2024 15:30:55 +0800 Subject: [PATCH] fix: uniscript entry is displayed in zen mode (#1842) * fix: uniscript entry is displayed in zen mode * refactor: update demo data --- .../src/data/docs/default-document-data-en.ts | 19 ++++++++++++------- examples/src/docs/main.ts | 4 ++-- packages/uniscript/src/controllers/menu.ts | 5 +++-- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/examples/src/data/docs/default-document-data-en.ts b/examples/src/data/docs/default-document-data-en.ts index 1ba4cce6c2..adffa67b71 100644 --- a/examples/src/data/docs/default-document-data-en.ts +++ b/examples/src/data/docs/default-document-data-en.ts @@ -25,6 +25,7 @@ import { SectionType, WrapTextType, } from '@univerjs/core'; +import { ptToPixel } from '@univerjs/engine-render'; export const DEFAULT_DOCUMENT_DATA_EN: IDocumentData = { id: 'd', @@ -399,7 +400,7 @@ export const DEFAULT_DOCUMENT_DATA_EN: IDocumentData = { startIndex: 2629, columnProperties: [ { - width: 200, + width: 300, paddingEnd: 5, }, ], @@ -418,13 +419,17 @@ export const DEFAULT_DOCUMENT_DATA_EN: IDocumentData = { }, documentStyle: { pageSize: { - width: 594.3, - height: 840.51, + width: ptToPixel(595), + height: ptToPixel(842), + }, + marginTop: ptToPixel(50), + marginBottom: ptToPixel(50), + marginRight: ptToPixel(50), + marginLeft: ptToPixel(50), + renderConfig: { + vertexAngle: 0, + centerAngle: 0, }, - marginTop: 72, - marginBottom: 72, - marginRight: 90, - marginLeft: 90, // gridType: GridType.LINES_AND_CHARS, // linePitch: 24, // charSpace: 12, diff --git a/examples/src/docs/main.ts b/examples/src/docs/main.ts index 786c657e2e..cfb2d06a10 100644 --- a/examples/src/docs/main.ts +++ b/examples/src/docs/main.ts @@ -23,7 +23,7 @@ import { UniverRenderEnginePlugin } from '@univerjs/engine-render'; import { UniverUIPlugin } from '@univerjs/ui'; import { UniverFormulaEnginePlugin } from '@univerjs/engine-formula'; -import { DEFAULT_DOCUMENT_DATA_CN } from '../data'; +import { DEFAULT_DOCUMENT_DATA_EN } from '../data'; import { DebuggerPlugin } from '../plugins/debugger'; import { locales } from './locales'; @@ -61,7 +61,7 @@ univer.registerPlugin(UniverDocsUIPlugin, { }, }); -univer.createUniverDoc(DEFAULT_DOCUMENT_DATA_CN); +univer.createUniverDoc(DEFAULT_DOCUMENT_DATA_EN); // use for console test declare global { diff --git a/packages/uniscript/src/controllers/menu.ts b/packages/uniscript/src/controllers/menu.ts index b8458f7d85..fe4532aafc 100644 --- a/packages/uniscript/src/controllers/menu.ts +++ b/packages/uniscript/src/controllers/menu.ts @@ -15,9 +15,10 @@ */ import type { IMenuButtonItem } from '@univerjs/ui'; -import { MenuItemType, MenuPosition } from '@univerjs/ui'; +import { getMenuHiddenObservable, MenuItemType, MenuPosition } from '@univerjs/ui'; import type { IAccessor } from '@wendellhu/redi'; +import { UniverInstanceType } from '@univerjs/core'; import { ToggleScriptPanelOperation } from '../commands/operations/panel.operation'; export function UniscriptMenuItemFactory(accessor: IAccessor): IMenuButtonItem { @@ -29,7 +30,7 @@ export function UniscriptMenuItemFactory(accessor: IAccessor): IMenuButtonItem { type: MenuItemType.BUTTON, positions: [MenuPosition.TOOLBAR_START], // FIXME hidden$ and disabled$ are not correctly in doc - // hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.SHEET), + hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.SHEET), // disabled$: getCurrentSheetDisabled$(accessor), }; }