From b59f35bf0b09bac83c57d7f9ffdfc8eb0419ba07 Mon Sep 17 00:00:00 2001 From: wpxp123456 <2677556700@qq.com> Date: Sat, 19 Apr 2025 20:40:57 +0800 Subject: [PATCH] fix: fix menu icon and en_US title (#5049) --- packages/sheets-ui/src/controllers/menu/insert.menu.ts | 3 ++- packages/sheets-ui/src/controllers/menu/menu.ts | 2 ++ packages/sheets-ui/src/locale/en-US.ts | 8 ++++---- packages/ui/src/common/component-manager.ts | 2 ++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/packages/sheets-ui/src/controllers/menu/insert.menu.ts b/packages/sheets-ui/src/controllers/menu/insert.menu.ts index 8b4cfd6ef2..d383d98e2c 100644 --- a/packages/sheets-ui/src/controllers/menu/insert.menu.ts +++ b/packages/sheets-ui/src/controllers/menu/insert.menu.ts @@ -21,6 +21,7 @@ import { InsertColAfterCommand, InsertColBeforeCommand, InsertMultiColsLeftCommand, + InsertMultiColsRightCommand, InsertMultiRowsAboveCommand, InsertMultiRowsAfterCommand, InsertRowAfterCommand, @@ -404,7 +405,7 @@ export function InsertMultiColsRightHeaderMenuItemFactory(accessor: IAccessor): const commandService = accessor.get(ICommandService); const defaultValue = 1; return { - id: InsertMultiRowsAboveCommand.id, + id: InsertMultiColsRightCommand.id, type: MenuItemType.BUTTON, icon: 'RightInsertColumn', label: { diff --git a/packages/sheets-ui/src/controllers/menu/menu.ts b/packages/sheets-ui/src/controllers/menu/menu.ts index b4625035d5..649ccfbd95 100644 --- a/packages/sheets-ui/src/controllers/menu/menu.ts +++ b/packages/sheets-ui/src/controllers/menu/menu.ts @@ -1107,6 +1107,7 @@ export function ShowRowMenuItemFactory(accessor: IAccessor): IMenuButtonItem { return { id: SetSelectedRowsVisibleCommand.id, type: MenuItemType.BUTTON, + icon: 'EyeOutlineSingle', title: 'rightClick.showHideRow', hidden$: deriveStateFromActiveSheet$(univerInstanceService, true, ({ worksheet }) => new Observable((subscriber) => { function hasHiddenRowsInSelections(): boolean { @@ -1141,6 +1142,7 @@ export function ShowColMenuItemFactory(accessor: IAccessor): IMenuButtonItem { return { id: SetSelectedColsVisibleCommand.id, type: MenuItemType.BUTTON, + icon: 'EyeOutlineSingle', title: 'rightClick.showHideColumn', hidden$: deriveStateFromActiveSheet$(univerInstanceService, true, ({ worksheet }) => new Observable((subscriber) => { function hasHiddenColsInSelections(): boolean { diff --git a/packages/sheets-ui/src/locale/en-US.ts b/packages/sheets-ui/src/locale/en-US.ts index ddf193dae7..206d9e5d99 100644 --- a/packages/sheets-ui/src/locale/en-US.ts +++ b/packages/sheets-ui/src/locale/en-US.ts @@ -216,16 +216,16 @@ const locale: typeof zhCN = { toBottomAdd: 'Towards Bottom Add', toLeftAdd: 'Towards Left Add', toRightAdd: 'Towards Right Add', - deleteSelectedRow: 'Delete Selected row', - deleteSelectedColumn: 'Delete Selected column', + deleteSelectedRow: 'Delete Selected Row', + deleteSelectedColumn: 'Delete Selected Column', hideSelectedRow: 'Hide Selected Row', - showHideRow: 'Show Selected Row', + showHideRow: 'Show Hide Row', rowHeight: 'Row Height', hideSelectedColumn: 'Hide Selected Column', showHideColumn: 'Show Hide Column', columnWidth: 'Column Width', moveLeft: 'Move Left', - moveUp: 'Move up', + moveUp: 'Move Up', moveRight: 'Move Right', moveDown: 'Move Down', add: 'Add', diff --git a/packages/ui/src/common/component-manager.ts b/packages/ui/src/common/component-manager.ts index a3a5315d81..f71bbe323a 100644 --- a/packages/ui/src/common/component-manager.ts +++ b/packages/ui/src/common/component-manager.ts @@ -54,6 +54,7 @@ import { DownBorder, EuroSingle, ExportSingle, + EyeOutlineSingle, FolderSingle, FontColor, FontSizeIncreaseSingle, @@ -257,6 +258,7 @@ export class ComponentManager { EuroSingle, RoubleSingle, DollarSingle, + EyeOutlineSingle, }; for (const k in iconList) {