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(permission): add owner permission inherit marker (#6782)

wpxp123456445e1f47a880
diff --git a/packages/core/src/services/authz-io/authz-io-local.service.ts b/packages/core/src/services/authz-io/authz-io-local.service.ts
index cfd634f171..006d5be6f3 100644
--- a/packages/core/src/services/authz-io/authz-io-local.service.ts
+++ b/packages/core/src/services/authz-io/authz-io-local.service.ts
@@ -42,6 +42,11 @@ export class AuthzIoLocalService implements IAuthzIoService {
private _permissionMap: Map<string, IPermissionData> = new Map([]);
// Store explicit permission overrides: key is "objectID:action", value is the allowed state
private _permissionOverrides: Map<string, boolean> = new Map();
+ /**
+ * Whether the document owner inherits permissions for all protected ranges.
+ * If true, the document owner cannot be selected when specifying user edits for a protected range, and the document owner will have edit permissions for all protected ranges by default.
+ */
+ private _cfgEnableObjInherit: boolean = false;
constructor(
@IResourceManagerService private _resourceManagerService: IResourceManagerService,
@@ -317,4 +322,12 @@ export class AuthzIoLocalService implements IAuthzIoService {
async putCollaborators(config: IPutCollaboratorsRequest): Promise<void> {
return undefined;
}
+
+ setCfgEnableObjInherit(enabled: boolean): void {
+ this._cfgEnableObjInherit = enabled;
+ }
+
+ getCfgEnableObjInherit(): boolean {
+ return this._cfgEnableObjInherit;
+ }
}
diff --git a/packages/core/src/services/authz-io/type.ts b/packages/core/src/services/authz-io/type.ts
index 5573596c9b..e8d5a62670 100644
--- a/packages/core/src/services/authz-io/type.ts
+++ b/packages/core/src/services/authz-io/type.ts
@@ -32,6 +32,8 @@ export interface IAuthzIoService {
deleteCollaborator(config: IDeleteCollaboratorRequest, context?: ILogContext): Promise<void>;
createCollaborator(config: ICreateCollaboratorRequest, context?: ILogContext): Promise<void>;
putCollaborators(config: IPutCollaboratorsRequest, context?: ILogContext): Promise<void>;
+ setCfgEnableObjInherit?(enabled: boolean): void;
+ getCfgEnableObjInherit?(): boolean;
}
export const IAuthzIoService = createIdentifier<IAuthzIoService>('IAuthzIoIoService');
diff --git a/packages/sheets-ui/src/locale/ca-ES.ts b/packages/sheets-ui/src/locale/ca-ES.ts
index 11f2f88856..c611ba8ace 100644
--- a/packages/sheets-ui/src/locale/ca-ES.ts
+++ b/packages/sheets-ui/src/locale/ca-ES.ts
@@ -460,6 +460,8 @@ const locale: typeof enUS = {
copy: 'Copiar',
alert: 'Alerta',
search: 'Cercar',
+ ownerInherit: 'Propietario del documento, herencia de permisos habilitada',
+ ownerWithoutInherit: 'Propietario del documento, herencia de permisos no habilitada',
alertContent: 'Aquest interval està protegit i actualment no hi ha permisos d\'edició disponibles. Si necessiteu editar, contacteu amb el creador.',
userEmpty: 'cap persona designada, compartiu l\'enllaç per convidar persones específiques.',
listEmpty: 'No heu configurat cap interval o full com a protegit.',
diff --git a/packages/sheets-ui/src/locale/en-US.ts b/packages/sheets-ui/src/locale/en-US.ts
index 3166818480..6cd59781d9 100644
--- a/packages/sheets-ui/src/locale/en-US.ts
+++ b/packages/sheets-ui/src/locale/en-US.ts
@@ -458,6 +458,8 @@ const locale = {
copy: 'Copy',
alert: 'Alert',
search: 'Search',
+ ownerInherit: 'Document owner, enabled permission inheritance',
+ ownerWithoutInherit: 'Document owner, not enabled permission inheritance',
alertContent: 'This range has been protected and no editing permissions are currently available. If you need to edit, please contact the creator.',
userEmpty: 'no designated person , Share link to invite specific people.',
listEmpty: 'You haven\'t set up any ranges or sheets as protected.',
diff --git a/packages/sheets-ui/src/locale/es-ES.ts b/packages/sheets-ui/src/locale/es-ES.ts
index 25160f3af7..0b9cfe485b 100644
--- a/packages/sheets-ui/src/locale/es-ES.ts
+++ b/packages/sheets-ui/src/locale/es-ES.ts
@@ -460,6 +460,8 @@ const locale: typeof enUS = {
copy: 'Copiar',
alert: 'Alerta',
search: 'Buscar',
+ ownerInherit: 'Propietario del documento, herencia de permisos habilitada',
+ ownerWithoutInherit: 'Propietario del documento, herencia de permisos no habilitada',
alertContent: 'Este rango está protegido y no hay permisos de edición disponibles actualmente. Si necesitas editar, contacta al creador.',
userEmpty: 'ninguna persona designada, comparte el enlace para invitar a personas específicas.',
listEmpty: 'No has configurado ningún rango u hoja como protegido.',
diff --git a/packages/sheets-ui/src/locale/fa-IR.ts b/packages/sheets-ui/src/locale/fa-IR.ts
index 78263b32bf..c62ce24d06 100644
--- a/packages/sheets-ui/src/locale/fa-IR.ts
+++ b/packages/sheets-ui/src/locale/fa-IR.ts
@@ -460,6 +460,8 @@ const locale: typeof enUS = {
copy: 'کپی',
alert: 'هشدار',
search: 'جستجو',
+ ownerInherit: 'مالک سند، وراثت مجوز فعال است',
+ ownerWithoutInherit: 'مالک سند، وراثت مجوز فعال نیست',
alertContent: 'این محدوده محافظت شده است و در حال حاضر هیچ مجوز ویرایشی در دسترس نیست. اگر نیاز به ویرایش دارید، لطفا با سازنده تماس بگیرید.',
userEmpty: 'هیچ شخص تعیین شده‌ای وجود ندارد، لینک اشتراک را برای دعوت افراد خاص ارسال کنید.',
listEmpty: 'شما هیچ محدوده یا برگه‌ای را به عنوان محافظت شده تنظیم نکرده‌اید.',
diff --git a/packages/sheets-ui/src/locale/fr-FR.ts b/packages/sheets-ui/src/locale/fr-FR.ts
index 52473cc7c8..379f4c1791 100644
--- a/packages/sheets-ui/src/locale/fr-FR.ts
+++ b/packages/sheets-ui/src/locale/fr-FR.ts
@@ -460,6 +460,8 @@ const locale: typeof enUS = {
copy: 'Copier',
alert: 'Alerte',
search: 'Rechercher',
+ ownerInherit: 'Propriétaire du document, héritage des permissions activé',
+ ownerWithoutInherit: 'Propriétaire du document, héritage des permissions non activé',
alertContent: 'Cette plage est protégée et aucune permission de modification n\'est actuellement disponible. Si vous avez besoin de modifier, veuillez contacter le créateur.',
userEmpty: 'aucune personne désignée, Partagez le lien pour inviter des personnes spécifiques.',
listEmpty: 'Vous n\'avez défini aucune plage ou feuille comme protégée.',
diff --git a/packages/sheets-ui/src/locale/ja-JP.ts b/packages/sheets-ui/src/locale/ja-JP.ts
index 90fce50178..954df4607c 100644
--- a/packages/sheets-ui/src/locale/ja-JP.ts
+++ b/packages/sheets-ui/src/locale/ja-JP.ts
@@ -460,6 +460,8 @@ const locale: typeof enUS = {
copy: 'コピー',
alert: '警告',
search: '検索',
+ ownerInherit: 'ドキュメント所有者、権限の継承が有効',
+ ownerWithoutInherit: 'ドキュメント所有者、権限の継承が有効ではない',
alertContent: 'この範囲は保護されており、現在編集権限がありません。編集するには作成者に連絡してください。',
userEmpty: '指定されたユーザーがいません。特定のユーザーを招待するためにリンクを共有してください。',
listEmpty: '保護された範囲やシートがまだ設定されていません。',
diff --git a/packages/sheets-ui/src/locale/ko-KR.ts b/packages/sheets-ui/src/locale/ko-KR.ts
index 88509c3ac4..6a46c4d12c 100644
--- a/packages/sheets-ui/src/locale/ko-KR.ts
+++ b/packages/sheets-ui/src/locale/ko-KR.ts
@@ -460,6 +460,8 @@ const locale: typeof enUS = {
copy: '복사',
alert: '경고',
search: '검색',
+ ownerInherit: '문서 소유자, 권한 상속 활성화',
+ ownerWithoutInherit: '문서 소유자, 권한 상속이 활성화되지 않았습니다',
alertContent: '이 범위는 보호되어 있어 현재 편집 권한이 없습니다. 편집하려면 작성자에게 문의하세요.',
userEmpty: '지정된 사용자가 없습니다. 특정 사용자 초대를 위해 링크를 공유하세요.',
listEmpty: '보호된 범위나 시트가 아직 설정되지 않았습니다.',
diff --git a/packages/sheets-ui/src/locale/ru-RU.ts b/packages/sheets-ui/src/locale/ru-RU.ts
index 5fa07033c9..425b698f37 100644
--- a/packages/sheets-ui/src/locale/ru-RU.ts
+++ b/packages/sheets-ui/src/locale/ru-RU.ts
@@ -460,6 +460,8 @@ const locale: typeof enUS = {
copy: 'Копировать',
alert: 'Предупреждение',
search: 'Поиск',
+ ownerInherit: 'Владелец документа, включено наследование разрешений',
+ ownerWithoutInherit: 'Владелец документа, не включено наследование разрешений',
alertContent: 'Этот диапазон защищен и в настоящее время недоступен для редактирования. Если вам нужно редактировать, пожалуйста, свяжитесь с создателем.',
userEmpty: 'нет назначенных лиц, поделитесь ссылкой, чтобы пригласить конкретных людей.',
listEmpty: 'Вы не установили ни одного защищенного диапазона или листа.',
diff --git a/packages/sheets-ui/src/locale/sk-SK.ts b/packages/sheets-ui/src/locale/sk-SK.ts
index ee5fc90ccb..f6fdb346d6 100644
--- a/packages/sheets-ui/src/locale/sk-SK.ts
+++ b/packages/sheets-ui/src/locale/sk-SK.ts
@@ -460,6 +460,8 @@ const locale: typeof enUS = {
copy: 'Kopírovať',
alert: 'Upozornenie',
search: 'Hľadať',
+ ownerInherit: 'Vlastník dokumentu, dědičnost oprávnění povolena',
+ ownerWithoutInherit: 'Vlastník dokumentu, dědičnost oprávnění není povolena',
alertContent: 'Tento rozsah je chránený a momentálne nemáte povolenie na úpravy. Ak potrebujete upravovať, kontaktujte autora.',
userEmpty: 'žiadna určená osoba, zdieľajte odkaz na pozvanie konkrétnych ľudí.',
listEmpty: 'Nenastavili ste žiadne rozsahy ani hárky ako chránené.',
diff --git a/packages/sheets-ui/src/locale/vi-VN.ts b/packages/sheets-ui/src/locale/vi-VN.ts
index 8941770778..fe97ac80a3 100644
--- a/packages/sheets-ui/src/locale/vi-VN.ts
+++ b/packages/sheets-ui/src/locale/vi-VN.ts
@@ -457,6 +457,8 @@ const locale: typeof enUS = {
copy: 'Sao chép',
alert: 'Thông báo',
search: 'Tìm kiếm',
+ ownerInherit: 'Chủ sở hữu tài liệu, đã bật kế thừa quyền',
+ ownerWithoutInherit: 'Chủ sở hữu tài liệu, chưa bật kế thừa quyền',
alertContent: 'Phạm vi này đã được bảo vệ, hiện không có quyền chỉnh sửa. Nếu cần chỉnh sửa, vui lòng liên hệ với người tạo.',
userEmpty: 'Không có người chỉ định, chia sẻ liên kết để mời người cụ thể.',
listEmpty: 'Bạn chưa thiết lập bất kỳ phạm vi hoặc bảng tính nào ở trạng thái được bảo vệ.',
diff --git a/packages/sheets-ui/src/locale/zh-CN.ts b/packages/sheets-ui/src/locale/zh-CN.ts
index d60ef2b9bc..0b14f38035 100644
--- a/packages/sheets-ui/src/locale/zh-CN.ts
+++ b/packages/sheets-ui/src/locale/zh-CN.ts
@@ -458,6 +458,8 @@ const locale: typeof enUS = {
copy: '复制',
alert: '提示',
search: '搜索',
+ ownerInherit: '文档所有者,已开启权限继承',
+ ownerWithoutInherit: '文档所有者,未开启权限继承',
alertContent: '该范围已被保护,目前无编辑权限。如需编辑,请联系创建者。',
userEmpty: '没有指定的人员,分享链接以邀请特定的人。',
listEmpty: '你还没有设置任何范围或工作表为受保护状态。',
diff --git a/packages/sheets-ui/src/locale/zh-TW.ts b/packages/sheets-ui/src/locale/zh-TW.ts
index 054f888191..d1f9cea883 100644
--- a/packages/sheets-ui/src/locale/zh-TW.ts
+++ b/packages/sheets-ui/src/locale/zh-TW.ts
@@ -458,6 +458,8 @@ const locale: typeof enUS = {
copy: '複製',
alert: '提示',
search: '搜索',
+ ownerInherit: '文檔所有者,已開啟權限繼承',
+ ownerWithoutInherit: '文檔所有者,未開啟權限繼承',
alertContent: '該範圍已被保護,目前無編輯權限。如需編輯,請聯絡創建者。 ',
userEmpty: '沒有指定的人員,分享連結以邀請特定的人。 ',
listEmpty: '你還沒有設定任何範圍或工作表為受保護狀態。 ',
diff --git a/packages/sheets-ui/src/views/permission/panel-detail/PermissionDetailFooterPart.tsx b/packages/sheets-ui/src/views/permission/panel-detail/PermissionDetailFooterPart.tsx
index 2115c1179e..ce94ddf45a 100644
--- a/packages/sheets-ui/src/views/permission/panel-detail/PermissionDetailFooterPart.tsx
+++ b/packages/sheets-ui/src/views/permission/panel-detail/PermissionDetailFooterPart.tsx
@@ -83,17 +83,22 @@ export const PermissionDetailFooterPart = (props: IPermissionDetailFooterPartPro
}
let collaborators = sheetPermissionUserManagerService.selectUserList;
- if (activeRule.editState === EditStateEnum.OnlyMe) {
- collaborators = [];
- sheetPermissionUserManagerService.setSelectUserList([]);
- }
+
const scopeObj = {
read: activeRule.viewState === ViewStateEnum.OthersCanView ? ObjectScope.AllCollaborator : ObjectScope.SomeCollaborator,
edit: activeRule.editState === EditStateEnum.DesignedUserCanEdit ? ObjectScope.SomeCollaborator : ObjectScope.OneSelf,
};
- if (activeRule.editState === EditStateEnum.DesignedUserCanEdit && collaborators.length === 0) {
+
+ if (activeRule.editState === EditStateEnum.OnlyMe) {
collaborators = [];
- scopeObj.edit = ObjectScope.OneSelf;
+ sheetPermissionUserManagerService.setSelectUserList([]);
+ } else if (activeRule.editState === EditStateEnum.DesignedUserCanEdit) {
+ if (collaborators.length === 0) {
+ collaborators = [];
+ scopeObj.edit = ObjectScope.OneSelf;
+ } else {
+ collaborators = collaborators.map((user) => ({ ...user, role: UnitRole.Editor }));
+ }
}
// Editing existing permission rules
diff --git a/packages/sheets-ui/src/views/permission/panel-detail/PermissionDetailUserPart.tsx b/packages/sheets-ui/src/views/permission/panel-detail/PermissionDetailUserPart.tsx
index ee1cd31b77..565759749a 100644
--- a/packages/sheets-ui/src/views/permission/panel-detail/PermissionDetailUserPart.tsx
+++ b/packages/sheets-ui/src/views/permission/panel-detail/PermissionDetailUserPart.tsx
@@ -63,7 +63,7 @@ export const PermissionDetailUserPart = (props: IPermissionDetailUserPartProps)
id: UNIVER_SHEET_PERMISSION_USER_DIALOG_ID,
title: { title: '' },
children: { label: UNIVER_SHEET_PERMISSION_USER_DIALOG },
- width: 280,
+ width: 'auto',
destroyOnClose: true,
closable: false,
onClose: () => dialogService.close(UNIVER_SHEET_PERMISSION_USER_DIALOG_ID),
diff --git a/packages/sheets-ui/src/views/permission/user-dialog/index.tsx b/packages/sheets-ui/src/views/permission/user-dialog/index.tsx
index f9d1e87d55..5f330c3c98 100644
--- a/packages/sheets-ui/src/views/permission/user-dialog/index.tsx
+++ b/packages/sheets-ui/src/views/permission/user-dialog/index.tsx
@@ -15,7 +15,7 @@
*/
import type { ICollaborator } from '@univerjs/protocol';
-import { LocaleService } from '@univerjs/core';
+import { IAuthzIoService, LocaleService } from '@univerjs/core';
import { Avatar, Button, clsx, Input, scrollbarClassName } from '@univerjs/design';
import { CheckMarkIcon } from '@univerjs/icons';
import { UnitRole } from '@univerjs/protocol';
@@ -30,12 +30,16 @@ export const SheetPermissionUserDialog = () => {
const localeService = useDependency(LocaleService);
const dialogService = useDependency(IDialogService);
const sheetPermissionUserManagerService = useDependency(SheetPermissionUserManagerService);
+ const authzIoService = useDependency(IAuthzIoService);
+
const userList = useObservable(sheetPermissionUserManagerService.userList$, sheetPermissionUserManagerService.userList);
const searchUserList = userList?.filter((item) => {
- return item.subject?.name.toLocaleLowerCase().includes(inputValue.toLocaleLowerCase()) && item.role === UnitRole.Editor;
+ return item.subject?.name.toLocaleLowerCase().includes(inputValue.toLocaleLowerCase()) && (item.role === UnitRole.Owner || item.role === UnitRole.Editor);
}) ?? [];
const [selectUserInfo, setSelectUserInfo] = useState<ICollaborator[]>(sheetPermissionUserManagerService.selectUserList);
+ const cfgEnableObjInherit = authzIoService.getCfgEnableObjInherit?.() ?? false;
+
const handleChangeUser = (item: ICollaborator) => {
const index = selectUserInfo?.findIndex((v) => v.subject?.userID === item.subject?.userID);
if (index === -1) {
@@ -57,9 +61,25 @@ export const SheetPermissionUserDialog = () => {
onChange={(v) => setInputValue(v)}
/>
</div>
- <div className={clsx('univer-h-60 univer-overflow-y-auto', scrollbarClassName)}>
+ <div className={clsx('univer-h-60 univer-min-w-72 univer-overflow-y-auto', scrollbarClassName)}>
{searchUserList?.length > 0
? searchUserList?.map((item) => {
+ if (cfgEnableObjInherit && item.role === UnitRole.Owner) {
+ return (
+ <div
+ key={item.subject?.userID}
+ className={`
+ univer-my-2 univer-flex univer-cursor-not-allowed univer-items-center
+ univer-rounded-md
+ `}
+ >
+ <Avatar src={item.subject?.avatar} size={24} />
+ <div className="univer-mx-1.5 univer-flex-1">{item.subject?.name}</div>
+ <div className="univer-text-xs univer-text-rose-600">{localeService.t('permission.dialog.ownerInherit')}</div>
+ </div>
+ );
+ }
+
return (
<div
key={item.subject?.userID}
@@ -70,8 +90,17 @@ export const SheetPermissionUserDialog = () => {
onClick={() => handleChangeUser(item)}
>
<Avatar src={item.subject?.avatar} size={24} />
- <div className="univer-ml-1.5 univer-flex-1">{item.subject?.name}</div>
- {selectUserInfo?.findIndex((v) => v.subject?.userID === item.subject?.userID) !== -1 && (<div><CheckMarkIcon /></div>)}
+ <div className="univer-mx-1.5 univer-flex-1">{item.subject?.name}</div>
+ {item.role === UnitRole.Owner && (
+ <div className="univer-text-xs univer-text-rose-600">{localeService.t('permission.dialog.ownerWithoutInherit')}</div>
+ )}
+ {selectUserInfo?.findIndex((v) => v.subject?.userID === item.subject?.userID) !== -1 && (
+ <div>
+ <CheckMarkIcon
+ className="univer-ml-1.5"
+ />
+ </div>
+ )}
</div>
);
})