Skip to content

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.

feat: add pivot table to unitoolbar & ui fix (#2961)

YuHong234b4bb7ba50
diff --git a/packages-experimental/uni-docs-ui/package.json b/packages-experimental/uni-docs-ui/package.json
index f68801dc5a..9d8b8ded5a 100644
--- a/packages-experimental/uni-docs-ui/package.json
+++ b/packages-experimental/uni-docs-ui/package.json
@@ -61,6 +61,7 @@
"@univerjs/docs": "workspace:*",
"@univerjs/docs-drawing-ui": "workspace:*",
"@univerjs/docs-ui": "workspace:*",
+ "@univerjs/engine-render": "workspace:*",
"@univerjs/ui": "workspace:*",
"@univerjs/uniui": "workspace:*",
"rxjs": ">=7.0.0"
diff --git a/packages-experimental/uni-docs-ui/src/controllers/menu.ts b/packages-experimental/uni-docs-ui/src/controllers/menu.ts
index 64a7661268..951264af37 100644
--- a/packages-experimental/uni-docs-ui/src/controllers/menu.ts
+++ b/packages-experimental/uni-docs-ui/src/controllers/menu.ts
@@ -16,16 +16,18 @@
import type { IAccessor } from '@univerjs/core';
import { BooleanNumber, DOCS_NORMAL_EDITOR_UNIT_ID_KEY, ICommandService, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';
-import { SetInlineFormatCommand, SetTextSelectionsOperation, TextSelectionManagerService } from '@univerjs/docs';
+import { DocSkeletonManagerService, SetInlineFormatCommand, SetTextSelectionsOperation, TextSelectionManagerService } from '@univerjs/docs';
+import { DocumentEditArea, IRenderManagerService } from '@univerjs/engine-render';
-import { getMenuHiddenObservable, type IMenuButtonItem, MenuGroup, MenuItemType } from '@univerjs/ui';
+import { getHeaderFooterMenuHiddenObservable, getMenuHiddenObservable, type IMenuButtonItem, type IMenuItem, MenuGroup, MenuItemType, MenuPosition } from '@univerjs/ui';
import { FONT_GROUP_MENU_ID } from '@univerjs/uniui';
-import { Observable } from 'rxjs';
+import { combineLatest, Observable } from 'rxjs';
export const DOC_ITALIC_MUTATION_ID = 'doc.command.uni-italic';
export const DOC_BOLD_MUTATION_ID = 'doc.command.uni-bold';
export const DOC_UNDERLINE_MUTATION_ID = 'doc.command.uni-underline';
export const DOC_STRIKE_MUTATION_ID = 'doc.command.uni-strike';
+export const DOC_TABLE_MUTATION_ID = 'doc.command.uni-table';
export function DocBoldMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
const commandService = accessor.get(ICommandService);
@@ -170,6 +172,22 @@ export function DocStrikeThroughMenuItemFactory(accessor: IAccessor): IMenuButto
};
}
+export function DocTableMenuFactory(accessor: IAccessor): IMenuItem {
+ return {
+ id: DOC_TABLE_MUTATION_ID,
+ type: MenuItemType.BUTTON,
+ positions: [MenuPosition.TOOLBAR_START],
+ group: MenuGroup.TOOLBAR_LAYOUT,
+ icon: 'GridSingle',
+ tooltip: 'toolbar.table.main',
+ disabled$: getTableDisabledObservable(accessor),
+ // Do not show header footer menu and insert table at zen mode.
+ hidden$: combineLatest(getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_DOC), getInsertTableHiddenObservable(accessor), getHeaderFooterMenuHiddenObservable(accessor), (one, two, three) => {
+ return one || two || three;
+ }),
+ };
+}
+
function getFontStyleAtCursor(accessor: IAccessor) {
const univerInstanceService = accessor.get(IUniverInstanceService);
const textSelectionService = accessor.get(TextSelectionManagerService);
@@ -186,3 +204,87 @@ function getFontStyleAtCursor(accessor: IAccessor) {
const textRun = textRuns.find(({ st, ed }) => startOffset! >= st && startOffset! <= ed);
return textRun;
}
+
+function getTableDisabledObservable(accessor: IAccessor): Observable<boolean> {
+ const textSelectionManagerService = accessor.get(TextSelectionManagerService);
+
+ return new Observable((subscriber) => {
+ const subscription = textSelectionManagerService.textSelection$.subscribe((selection) => {
+ if (selection == null) {
+ subscriber.next(true);
+ return;
+ }
+
+ const { textRanges } = selection;
+
+ if (textRanges.length !== 1) {
+ subscriber.next(true);
+ return;
+ }
+
+ const textRange = textRanges[0];
+ const { collapsed, anchorNodePosition } = textRange;
+
+ if (!collapsed) {
+ subscriber.next(true);
+ return;
+ }
+
+ if (anchorNodePosition != null) {
+ const { path } = anchorNodePosition;
+
+ // TODO: Not support insert table in table cell now.
+ if (path.indexOf('cells') !== -1) {
+ subscriber.next(true);
+ return;
+ }
+ }
+
+ subscriber.next(false);
+ });
+
+ return () => subscription.unsubscribe();
+ });
+}
+
+function getInsertTableHiddenObservable(
+ accessor: IAccessor
+): Observable<boolean> {
+ const univerInstanceService = accessor.get(IUniverInstanceService);
+ const renderManagerService = accessor.get(IRenderManagerService);
+
+ return new Observable((subscriber) => {
+ const subscription = univerInstanceService.focused$.subscribe((unitId) => {
+ if (unitId == null) {
+ return subscriber.next(true);
+ }
+ const univerType = univerInstanceService.getUnitType(unitId);
+
+ if (univerType !== UniverInstanceType.UNIVER_DOC) {
+ return subscriber.next(true);
+ }
+
+ const currentRender = renderManagerService.getRenderById(unitId);
+ if (currentRender == null) {
+ return subscriber.next(true);
+ }
+
+ const viewModel = currentRender.with(DocSkeletonManagerService).getViewModel();
+
+ viewModel.editAreaChange$.subscribe((editArea) => {
+ subscriber.next(editArea === DocumentEditArea.HEADER || editArea === DocumentEditArea.FOOTER);
+ });
+ });
+
+ const currentRender = renderManagerService.getCurrentTypeOfRenderer(UniverInstanceType.UNIVER_DOC);
+ if (currentRender == null) {
+ return subscriber.next(true);
+ }
+
+ const viewModel = currentRender.with(DocSkeletonManagerService).getViewModel();
+
+ subscriber.next(viewModel.getEditArea() !== DocumentEditArea.BODY);
+
+ return () => subscription.unsubscribe();
+ });
+}
diff --git a/packages-experimental/uni-docs-ui/src/controllers/uni-docs-ui.controller.tsx b/packages-experimental/uni-docs-ui/src/controllers/uni-docs-ui.controller.tsx
index a9ef66af9d..1b32f5f1fc 100644
--- a/packages-experimental/uni-docs-ui/src/controllers/uni-docs-ui.controller.tsx
+++ b/packages-experimental/uni-docs-ui/src/controllers/uni-docs-ui.controller.tsx
@@ -19,10 +19,10 @@ import type { IMenuItemFactory } from '@univerjs/ui';
import { ComponentManager, ILayoutService, IMenuService, IShortcutService, IUIPartsService } from '@univerjs/ui';
import { BuiltinUniToolbarItemId, generateCloneMutation, UniToolbarService } from '@univerjs/uniui';
import type { IUniverDocsUIConfig } from '@univerjs/docs-ui';
-import { DocUIController } from '@univerjs/docs-ui';
-import { SetInlineFormatBoldCommand, SetInlineFormatFontFamilyCommand, SetInlineFormatFontSizeCommand, SetInlineFormatItalicCommand, SetInlineFormatStrikethroughCommand, SetInlineFormatTextBackgroundColorCommand, SetInlineFormatTextColorCommand, SetInlineFormatUnderlineCommand } from '@univerjs/docs';
+import { DocCreateTableOperation, DocUIController } from '@univerjs/docs-ui';
+import { BulletListCommand, OrderListCommand, SetInlineFormatBoldCommand, SetInlineFormatFontFamilyCommand, SetInlineFormatFontSizeCommand, SetInlineFormatItalicCommand, SetInlineFormatStrikethroughCommand, SetInlineFormatTextBackgroundColorCommand, SetInlineFormatTextColorCommand, SetInlineFormatUnderlineCommand } from '@univerjs/docs';
import { IMAGE_MENU_ID as DocsImageMenuId } from '@univerjs/docs-drawing-ui';
-import { DOC_BOLD_MUTATION_ID, DOC_ITALIC_MUTATION_ID, DOC_STRIKE_MUTATION_ID, DOC_UNDERLINE_MUTATION_ID, DocBoldMenuItemFactory, DocItalicMenuItemFactory, DocStrikeThroughMenuItemFactory, DocUnderlineMenuItemFactory } from './menu';
+import { DOC_BOLD_MUTATION_ID, DOC_ITALIC_MUTATION_ID, DOC_STRIKE_MUTATION_ID, DOC_TABLE_MUTATION_ID, DOC_UNDERLINE_MUTATION_ID, DocBoldMenuItemFactory, DocItalicMenuItemFactory, DocStrikeThroughMenuItemFactory, DocTableMenuFactory, DocUnderlineMenuItemFactory } from './menu';
@OnLifecycle(LifecycleStages.Ready, UniDocsUIController)
export class UniDocsUIController extends DocUIController {
@@ -61,6 +61,9 @@ export class UniDocsUIController extends DocUIController {
[BuiltinUniToolbarItemId.COLOR, SetInlineFormatTextColorCommand.id],
[BuiltinUniToolbarItemId.BACKGROUND, SetInlineFormatTextBackgroundColorCommand.id],
[BuiltinUniToolbarItemId.IMAGE, DocsImageMenuId],
+ [BuiltinUniToolbarItemId.TABLE, DOC_TABLE_MUTATION_ID],
+ [BuiltinUniToolbarItemId.ORDER_LIST, OrderListCommand.id],
+ [BuiltinUniToolbarItemId.UNORDER_LIST, BulletListCommand.id],
]).forEach(([id, menuId]) => {
this.disposeWithMe(this._toolbarService.implementItem(id, { id: menuId, type: UniverInstanceType.UNIVER_DOC }));
});
@@ -71,6 +74,7 @@ export class UniDocsUIController extends DocUIController {
DocItalicMenuItemFactory,
DocUnderlineMenuItemFactory,
DocStrikeThroughMenuItemFactory,
+ DocTableMenuFactory,
] as IMenuItemFactory[]
).forEach((factory) => {
this.disposeWithMe(this._menuService.addMenuItem(this._injector.invoke(factory), {}));
@@ -83,6 +87,7 @@ export class UniDocsUIController extends DocUIController {
generateCloneMutation(DOC_ITALIC_MUTATION_ID, SetInlineFormatItalicCommand),
generateCloneMutation(DOC_UNDERLINE_MUTATION_ID, SetInlineFormatUnderlineCommand),
generateCloneMutation(DOC_STRIKE_MUTATION_ID, SetInlineFormatStrikethroughCommand),
+ generateCloneMutation(DOC_TABLE_MUTATION_ID, DocCreateTableOperation),
].forEach((mutation) => {
this.disposeWithMe(this._commandService.registerCommand(mutation));
});
diff --git a/packages-experimental/uniui/src/controllers/menu.ts b/packages-experimental/uniui/src/controllers/menu.ts
index 3e98daccfa..60381baf75 100644
--- a/packages-experimental/uniui/src/controllers/menu.ts
+++ b/packages-experimental/uniui/src/controllers/menu.ts
@@ -36,6 +36,9 @@ export const FAKE_FONT_COLOR_MENU_ID = 'FAKE_FONT_COLOR_MENU_ID';
export const FAKE_BG_COLOR_MENU_ID = 'FAKE_BG_COLOR_MENU_ID';
export const FAKE_IMAGE_MENU_ID = 'FAKE_IMAGE_MENU_ID';
export const FAKE_FONT_GROUP_MENU_ID = 'FAKE_FONT_GROUP_MENU_ID';
+export const FAKE_TABLE_MENU_ID = 'FAKE_TABLE_MENU_ID';
+export const FAKE_UNORDER_LIST_MENU_ID = 'FAKE_UNORDER_LIST_MENU_ID';
+export const FAKE_ORDER_LIST_MENU_ID = 'FAKE_ORDER_LIST_MENU_ID';
export enum UNI_MENU_POSITIONS {
TOOLBAR_MAIN = 'toolbar_main',
@@ -113,6 +116,30 @@ export function FakeImageMenuFactory(accessor: IAccessor): IMenuItem {
};
}
+export function FakeUnorderListMenuItemFactory(accessor: IAccessor): IMenuItem {
+ return {
+ id: FAKE_UNORDER_LIST_MENU_ID,
+ type: MenuItemType.BUTTON_SELECTOR,
+ group: MenuGroup.TOOLBAR_LAYOUT,
+ icon: 'UnorderSingle',
+ tooltip: 'toolbar.unorder',
+ positions: [MenuPosition.TOOLBAR_START],
+ disabled$: new Observable((subscriber) => { subscriber.next(true); }),
+ };
+}
+
+export function FakeOrderListMenuItemFactory(accessor: IAccessor): IMenuItem {
+ return {
+ id: FAKE_ORDER_LIST_MENU_ID,
+ type: MenuItemType.BUTTON_SELECTOR,
+ group: MenuGroup.TOOLBAR_LAYOUT,
+ icon: 'OrderSingle',
+ tooltip: 'toolbar.order',
+ positions: [MenuPosition.TOOLBAR_START],
+ disabled$: new Observable((subscriber) => { subscriber.next(true); }),
+ };
+}
+
export function FontGroupMenuItemFactory(accessor: IAccessor): IMenuSelectorItem {
const univerInstanceService = accessor.get(IUniverInstanceService);
return {
@@ -136,6 +163,18 @@ export function FakeFontGroupMenuItemFactory(accessor: IAccessor): IMenuSelector
};
}
+export function FakePivotTableMenuItemFactory(accessor: IAccessor): IMenuItem {
+ return {
+ id: FAKE_TABLE_MENU_ID,
+ type: MenuItemType.BUTTON,
+ group: MenuGroup.TOOLBAR_OTHERS,
+ icon: 'PivotTableSingle',
+ tooltip: 'PivotTable',
+ positions: [MenuPosition.TOOLBAR_START],
+ disabled$: new Observable((subscriber) => { subscriber.next(true); }),
+ };
+}
+
export function UnitLineColorMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
return {
id: UNIT_LINE_COLOR_MENU_ID,
diff --git a/packages-experimental/uniui/src/controllers/uniui-toolbar.controller.tsx b/packages-experimental/uniui/src/controllers/uniui-toolbar.controller.tsx
index ba62aed378..e4d1209207 100644
--- a/packages-experimental/uniui/src/controllers/uniui-toolbar.controller.tsx
+++ b/packages-experimental/uniui/src/controllers/uniui-toolbar.controller.tsx
@@ -15,12 +15,12 @@
*/
import { Disposable, ICommandService, Inject, Injector, LifecycleStages, OnLifecycle } from '@univerjs/core';
-import { DeleteSingle, DownloadSingle, LockSingle, PrintSingle, ShareSingle, ZenSingle } from '@univerjs/icons';
+import { DeleteSingle, DownloadSingle, LockSingle, PivotTableSingle, PrintSingle, ShareSingle, ZenSingle } from '@univerjs/icons';
import type { IMenuItemFactory, MenuConfig } from '@univerjs/ui';
import { ComponentManager, IMenuService } from '@univerjs/ui';
import { DisposeUnitOperation } from '../commands/operations/uni.operation';
import { UniToolbarService } from '../services/toolbar/uni-toolbar-service';
-import { DeleteMenuItemFactory, DownloadMenuItemFactory, FakeBackgroundColorSelectorMenuItemFactory, FakeFontFamilySelectorMenuItemFactory, FakeFontGroupMenuItemFactory, FakeFontSizeSelectorMenuItemFactory, FakeImageMenuFactory, FakeTextColorSelectorMenuItemFactory, FontGroupMenuItemFactory, LockMenuItemFactory, PrintMenuItemFactory, ShareMenuItemFactory, ZenMenuItemFactory } from './menu';
+import { DeleteMenuItemFactory, DownloadMenuItemFactory, FakeBackgroundColorSelectorMenuItemFactory, FakeFontFamilySelectorMenuItemFactory, FakeFontGroupMenuItemFactory, FakeFontSizeSelectorMenuItemFactory, FakeImageMenuFactory, FakeOrderListMenuItemFactory, FakePivotTableMenuItemFactory, FakeTextColorSelectorMenuItemFactory, FakeUnorderListMenuItemFactory, FontGroupMenuItemFactory, LockMenuItemFactory, PrintMenuItemFactory, ShareMenuItemFactory, ZenMenuItemFactory } from './menu';
export interface IUniuiToolbarConfig {
menu: MenuConfig;
@@ -52,6 +52,7 @@ export class UniuiToolbarController extends Disposable {
PrintSingle,
ZenSingle,
DeleteSingle,
+ PivotTableSingle,
};
for (const k in iconList) {
this.disposeWithMe(componentManager.register(k, iconList[k]));
@@ -75,6 +76,9 @@ export class UniuiToolbarController extends Disposable {
FakeBackgroundColorSelectorMenuItemFactory,
FakeImageMenuFactory,
FakeFontGroupMenuItemFactory,
+ FakePivotTableMenuItemFactory,
+ FakeOrderListMenuItemFactory,
+ FakeUnorderListMenuItemFactory,
] as IMenuItemFactory[]
).forEach((factory) => {
this.disposeWithMe(this._menuService.addMenuItem(this._injector.invoke(factory), {}));
diff --git a/packages-experimental/uniui/src/services/toolbar/uni-toolbar-service.ts b/packages-experimental/uniui/src/services/toolbar/uni-toolbar-service.ts
index 98b0718111..1da83e8e0d 100644
--- a/packages-experimental/uniui/src/services/toolbar/uni-toolbar-service.ts
+++ b/packages-experimental/uniui/src/services/toolbar/uni-toolbar-service.ts
@@ -15,7 +15,7 @@
*/
import { Disposable, RedoCommand, toDisposable, UndoCommand, UniverInstanceType } from '@univerjs/core';
-import { FAKE_BG_COLOR_MENU_ID, FAKE_FONT_COLOR_MENU_ID, FAKE_FONT_FAMILY_MENU_ID, FAKE_FONT_GROUP_MENU_ID, FAKE_FONT_SIZE_MENU_ID, FAKE_IMAGE_MENU_ID, FONT_GROUP_MENU_ID } from '../../controllers/menu';
+import { FAKE_BG_COLOR_MENU_ID, FAKE_FONT_COLOR_MENU_ID, FAKE_FONT_FAMILY_MENU_ID, FAKE_FONT_GROUP_MENU_ID, FAKE_FONT_SIZE_MENU_ID, FAKE_IMAGE_MENU_ID, FAKE_ORDER_LIST_MENU_ID, FAKE_TABLE_MENU_ID, FAKE_UNORDER_LIST_MENU_ID, FONT_GROUP_MENU_ID } from '../../controllers/menu';
interface IItemImpl {
id: string;
@@ -36,7 +36,9 @@ export enum BuiltinUniToolbarItemId {
COLOR = 'color',
BACKGROUND = 'background',
IMAGE = 'image',
- PIVOT_TABLE = 'pivot-table',
+ TABLE = 'table',
+ UNORDER_LIST = 'unorder-list',
+ ORDER_LIST = 'order-list',
}
export class UniToolbarService extends Disposable {
@@ -85,6 +87,18 @@ export class UniToolbarService extends Disposable {
id: BuiltinUniToolbarItemId.IMAGE,
impl: [{ id: FAKE_IMAGE_MENU_ID, type: UniverInstanceType.UNIVER_UNKNOWN }],
},
+ {
+ id: BuiltinUniToolbarItemId.UNORDER_LIST,
+ impl: [{ id: FAKE_UNORDER_LIST_MENU_ID, type: UniverInstanceType.UNIVER_UNKNOWN }],
+ },
+ {
+ id: BuiltinUniToolbarItemId.ORDER_LIST,
+ impl: [{ id: FAKE_ORDER_LIST_MENU_ID, type: UniverInstanceType.UNIVER_UNKNOWN }],
+ },
+ {
+ id: BuiltinUniToolbarItemId.TABLE,
+ impl: [{ id: FAKE_TABLE_MENU_ID, type: UniverInstanceType.UNIVER_UNKNOWN }],
+ },
];
}
diff --git a/packages-experimental/uniui/src/views/uni-controls/UniControls.tsx b/packages-experimental/uniui/src/views/uni-controls/UniControls.tsx
index 20e5d33db3..ea6f745bf0 100644
--- a/packages-experimental/uniui/src/views/uni-controls/UniControls.tsx
+++ b/packages-experimental/uniui/src/views/uni-controls/UniControls.tsx
@@ -22,6 +22,7 @@ import { CheckMarkSingle, FullscreenSingle, IncreaseSingle, ZoomReduceSingle } f
import { Dropdown, Tooltip } from '@univerjs/design';
import clsx from 'clsx';
import { useDependency } from '@univerjs/core';
+import { ISidebarService } from '@univerjs/ui';
import { UniDiv } from '../uni-toolbar/UniFloatToolbar';
import type { IProjectNode } from '../../services/unit-grid/unit-grid.service';
import { IUnitGridService } from '../../services/unit-grid/unit-grid.service';
@@ -51,9 +52,11 @@ export enum UniControlItem {
}
export const UniControls = ({ zoom, onItemClick }: { zoom: number; onItemClick?: (key: UniControlItem) => void }) => {
- const zoomPercent = Math.floor(zoom * 100);
- const { zoomIn, zoomOut, fitView, setViewport, getNodes, setCenter, getZoom } = useReactFlow();
const unitGridService = useDependency(IUnitGridService);
+ const { zoomIn, zoomOut, fitView, getNodes, setCenter, getZoom } = useReactFlow();
+
+ const zoomPercent = Math.floor(zoom * 100);
+ const rightPadding = useRightSidebarVisible() ? 352 : 12;
const onZoomInHandler = () => {
zoomIn();
@@ -118,7 +121,7 @@ export const UniControls = ({ zoom, onItemClick }: { zoom: number; onItemClick?:
}, [fitView]);
return (
- <div className={styles.uniControls}>
+ <div className={styles.uniControls} style={{ right: `${rightPadding}px` }}>
<UniControlButton tooltips="Full screen" onClick={onFullscreenHandler}>
<FullscreenSingle />
</UniControlButton>
@@ -175,3 +178,19 @@ export const UniControls = ({ zoom, onItemClick }: { zoom: number; onItemClick?:
);
};
+function useRightSidebarVisible() {
+ const sidebarService = useDependency(ISidebarService);
+ const [visible, setVisible] = React.useState(false);
+
+ useEffect(() => {
+ const sidebarSubscription = sidebarService.sidebarOptions$.subscribe((options) => {
+ setVisible(!!options.visible);
+ });
+
+ return () => {
+ sidebarSubscription.unsubscribe();
+ };
+ }, [sidebarService]);
+
+ return visible;
+}
diff --git a/packages-experimental/uniui/src/views/uni-toolbar/index.module.less b/packages-experimental/uniui/src/views/uni-toolbar/index.module.less
index f290d5b0a1..8d97668e8a 100644
--- a/packages-experimental/uniui/src/views/uni-toolbar/index.module.less
+++ b/packages-experimental/uniui/src/views/uni-toolbar/index.module.less
@@ -311,6 +311,9 @@
}
}
}
+ .ui-plugin-sheets-font-family {
+ width: 60px;
+ }
}
.uni-formula-bar {
diff --git a/packages-experimental/uniui/src/views/workbench/workbench.module.less b/packages-experimental/uniui/src/views/workbench/workbench.module.less
index 32b9908498..ae9dc6b590 100644
--- a/packages-experimental/uniui/src/views/workbench/workbench.module.less
+++ b/packages-experimental/uniui/src/views/workbench/workbench.module.less
@@ -13,7 +13,7 @@
}
&-toolbar-wrapper {
- max-width: calc(100% - 700px);
+ max-width: calc(100% - 650px);
pointer-events: auto;
}
diff --git a/packages/docs-drawing-ui/src/index.ts b/packages/docs-drawing-ui/src/index.ts
index 6fb891026e..b4c22a4a74 100644
--- a/packages/docs-drawing-ui/src/index.ts
+++ b/packages/docs-drawing-ui/src/index.ts
@@ -32,5 +32,5 @@ export { InsertDocImageOperation } from './commands/operations/insert-image.oper
export { SidebarDocDrawingOperation } from './commands/operations/open-drawing-panel.operation';
export { IMAGE_MENU_ID } from './views/menu/image.menu';
-
+export { COMPONENT_DOC_UPLOAD_FILE_MENU } from './views/upload-component/component-name';
// #endregion
diff --git a/packages/docs-ui/src/controllers/menu/menu.ts b/packages/docs-ui/src/controllers/menu/menu.ts
index 06181633d7..f9a30e80a0 100644
--- a/packages/docs-ui/src/controllers/menu/menu.ts
+++ b/packages/docs-ui/src/controllers/menu/menu.ts
@@ -535,7 +535,7 @@ export function HeaderFooterMenuItemFactory(accessor: IAccessor): IMenuButtonIte
}
export const TableIcon = 'GridSingle';
-const TABLE_MENU_ID = 'doc.menu.table';
+export const TABLE_MENU_ID = 'doc.menu.table';
export function TableMenuFactory(accessor: IAccessor): IMenuItem {
return {
diff --git a/packages/docs-ui/src/index.ts b/packages/docs-ui/src/index.ts
index d722b52c5f..eb4ce53739 100644
--- a/packages/docs-ui/src/index.ts
+++ b/packages/docs-ui/src/index.ts
@@ -29,5 +29,5 @@ export { DocUIController } from './controllers/doc-ui.controller';
// #region - all commands
export { DocCopyCommand, DocCutCommand, DocPasteCommand } from './commands/commands/clipboard.command';
-
+export { DocCreateTableOperation } from './commands/operations/doc-create-table.operation';
// #endregion
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 41b598adb4..ea9f706699 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -133,7 +133,7 @@ importers:
'@storybook/addon-interactions':
specifier: 8.2.7
'@storybook/addon-links':
specifier: 8.2.7
@@ -406,6 +406,9 @@ importers:
'@univerjs/docs-drawing-ui':
specifier: workspace:*
version: link:../../packages/docs-drawing-ui
+ '@univerjs/engine-render':
+ specifier: workspace:*
+ version: link:../../packages/engine-render
'@univerjs/icons':
specifier: ^0.1.72
@@ -12799,11 +12802,11 @@ snapshots:
'@storybook/global': 5.0.0
storybook: 8.2.7(@babel/[email protected](@babel/[email protected]))
dependencies:
'@storybook/global': 5.0.0
'@storybook/instrumenter': 8.2.7([email protected](@babel/[email protected](@babel/[email protected])))
polished: 4.3.1
storybook: 8.2.7(@babel/[email protected](@babel/[email protected]))
ts-dedent: 2.2.0
@@ -13094,12 +13097,12 @@ snapshots:
optionalDependencies:
typescript: 5.5.4
dependencies:
'@storybook/csf': 0.1.11
'@storybook/instrumenter': 8.2.7([email protected](@babel/[email protected](@babel/[email protected])))
'@testing-library/dom': 10.1.0
'@testing-library/user-event': 14.5.2(@testing-library/[email protected])
'@vitest/expect': 1.6.0
'@vitest/spy': 1.6.0
@@ -13234,7 +13237,7 @@ snapshots:
lz-string: 1.5.0
pretty-format: 27.5.1
dependencies:
'@adobe/css-tools': 4.4.0
'@babel/runtime': 7.24.7