fix: only users with editing permissions can join the protected colla… (

#2504) * fix: only users with editing permissions can join the protected collaboration * fix: fix unhide permission
dream-num · Jun 13, 2024 · 2ea683e · 2ea683e
1 parent b3393ef
commit 2ea683e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/packages/sheets-ui/src/controllers/menu/sheet.menu.ts b/packages/sheets-ui/src/controllers/menu/sheet.menu.ts
@@ -228,8 +228,7 @@ export function ShowMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
  subscriber.next(false);
  return disposable.dispose;
  }).pipe(
- combineLatestWith(getWorkbookPermissionDisable$(accessor, [WorkbookEditablePermission])),
- map(([defaultDisabled, permissionDisabled]) => defaultDisabled || permissionDisabled
- )),
+ combineLatestWith(getWorkbookPermissionDisable$(accessor, [WorkbookEditablePermission, WorkbookHideSheetPermission])),
+ map(([defaultDisabled, permissionDisabled]) => defaultDisabled || permissionDisabled)),
  };
 }
diff --git a/packages/sheets-ui/src/views/permission/user-dialog/index.tsx b/packages/sheets-ui/src/views/permission/user-dialog/index.tsx
@@ -34,7 +34,7 @@ export const SheetPermissionUserDialog = () => {
  const sheetPermissionUserManagerService = useDependency(SheetPermissionUserManagerService);
  const userList = sheetPermissionUserManagerService.userList;
  const searchUserList = userList.filter((item) => {
- return item.subject?.name.toLocaleLowerCase().includes(inputValue.toLocaleLowerCase()) && item.role !== UnitRole.Owner;
+ return item.subject?.name.toLocaleLowerCase().includes(inputValue.toLocaleLowerCase()) && item.role === UnitRole.Editor;
  });
  const [selectUserInfo, setSelectUserInfo] = useState<ICollaborator[]>(sheetPermissionUserManagerService.selectUserList);