fix: 2878 in pro

dream-num · Oct 16, 2024 · bc6b2f7 · bc6b2f7
1 parent bd87b95
commit bc6b2f7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/packages/docs-ui/src/controllers/menu/menu.ts b/packages/docs-ui/src/controllers/menu/menu.ts
@@ -20,6 +20,7 @@ import type { Subscription } from 'rxjs';
 import {
  BaselineOffset,
  BooleanNumber,
+ DOCS_ZEN_EDITOR_UNIT_ID_KEY,
  DocumentFlavor,
  HorizontalAlign,
  ICommandService,
@@ -805,7 +806,7 @@ export function DocSwitchModeMenuItemFactory(accessor: IAccessor): IMenuButtonIt
  type: MenuItemType.BUTTON,
  icon: 'KeyboardSingle',
  tooltip: 'toolbar.documentFlavor',
- hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_DOC),
+ hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_DOC, undefined, DOCS_ZEN_EDITOR_UNIT_ID_KEY),
  activated$: new Observable<boolean>((subscriber) => {
  const subscription = commandService.onCommandExecuted((c) => {
  if (c.id === SwitchDocModeCommand.id) {

diff --git a/packages/ui/src/common/menu-hidden-observable.ts b/packages/ui/src/common/menu-hidden-observable.ts
@@ -21,7 +21,8 @@ import { Observable } from 'rxjs';
 export function getMenuHiddenObservable(
  accessor: IAccessor,
  targetUniverType: UniverInstanceType,
- matchUnitId?: string
+ matchUnitId?: string,
+ needHideUnitId?: string
 ): Observable<boolean> {
  const univerInstanceService = accessor.get(IUniverInstanceService);
 
@@ -33,6 +34,9 @@ export function getMenuHiddenObservable(
  if (matchUnitId && matchUnitId !== unitId) {
  return subscriber.next(true);
  }
+ if (needHideUnitId && needHideUnitId === unitId) {
+ return subscriber.next(true);
+ }
  const univerType = univerInstanceService.getUnitType(unitId);
 
  subscriber.next(univerType !== targetUniverType);