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.

chore: update permission ui adjust position (#3849)

ybzkya41cf35c2169
diff --git a/packages/core/src/services/permission/permission.service.ts b/packages/core/src/services/permission/permission.service.ts
index 2ed94cf101..93e82685b5 100644
--- a/packages/core/src/services/permission/permission.service.ts
+++ b/packages/core/src/services/permission/permission.service.ts
@@ -27,6 +27,16 @@ export class PermissionService extends Disposable implements IPermissionService
private _permissionPointUpdate$ = new Subject<IPermissionPoint<unknown>>();
public permissionPointUpdate$ = this._permissionPointUpdate$.asObservable();
+ private _showComponents = true;
+
+ setShowComponents(showComponents: boolean) {
+ this._showComponents = showComponents;
+ }
+
+ getShowComponents() {
+ return this._showComponents;
+ }
+
deletePermissionPoint(permissionId: string) {
const permissionPoint = this._permissionPointMap.get(permissionId);
if (permissionPoint) {
diff --git a/packages/core/src/services/permission/type.ts b/packages/core/src/services/permission/type.ts
index 1c543e22d9..ee757589bb 100644
--- a/packages/core/src/services/permission/type.ts
+++ b/packages/core/src/services/permission/type.ts
@@ -62,6 +62,9 @@ export interface IPermissionService {
composePermission$(permissionId: string[]): Observable<IPermissionPoint<unknown>[]>;
composePermission(permissionId: string[]): IPermissionPoint<unknown>[];
getAllPermissionPoint(): Map<string, Observable<IPermissionPoint<unknown>>>;
+
+ getShowComponents(): boolean;
+ setShowComponents(showComponents: boolean): void;
}
export const IPermissionService = createIdentifier<IPermissionService>('univer.permission-service');
diff --git a/packages/facade/src/apis/sheets/f-permission.ts b/packages/facade/src/apis/sheets/f-permission.ts
index 762041851b..459d36f005 100644
--- a/packages/facade/src/apis/sheets/f-permission.ts
+++ b/packages/facade/src/apis/sheets/f-permission.ts
@@ -17,7 +17,6 @@
import type { IRange, RangePermissionPointConstructor, WorkbookPermissionPointConstructor, WorkSheetPermissionPointConstructor } from '@univerjs/core';
import { generateRandomId, IAuthzIoService, ICommandService, Inject, Injector, IPermissionService, Rectangle } from '@univerjs/core';
import { AddRangeProtectionMutation, AddWorksheetProtectionMutation, DeleteRangeProtectionMutation, DeleteWorksheetProtectionMutation, getAllWorksheetPermissionPoint, getAllWorksheetPermissionPointByPointPanel, RangeProtectionRuleModel, SetRangeProtectionMutation, SetWorksheetPermissionPointsMutation, UnitObject, WorkbookEditablePermission, WorksheetEditPermission, WorksheetProtectionPointModel, WorksheetProtectionRuleModel, WorksheetViewPermission } from '@univerjs/sheets';
-import { SheetPermissionInterceptorBaseController } from '@univerjs/sheets-ui';
export class FPermission {
constructor(
@@ -297,7 +296,6 @@ export class FPermission {
* @param {boolean} visible
*/
setPermissionDialogVisible(visible: boolean): void {
- const sheetPermissionInterceptorBaseController = this._injector.get(SheetPermissionInterceptorBaseController);
- sheetPermissionInterceptorBaseController.setShowPermissionDialog(visible);
+ this._permissionService.setShowComponents(visible);
}
}
diff --git a/packages/sheets-ui/src/controllers/permission/sheet-permission-interceptor-base.controller.ts b/packages/sheets-ui/src/controllers/permission/sheet-permission-interceptor-base.controller.ts
index 7b7fa631d0..23223c0560 100644
--- a/packages/sheets-ui/src/controllers/permission/sheet-permission-interceptor-base.controller.ts
+++ b/packages/sheets-ui/src/controllers/permission/sheet-permission-interceptor-base.controller.ts
@@ -44,8 +44,6 @@ export const SHEET_PERMISSION_PASTE_PLUGIN = 'SHEET_PERMISSION_PASTE_PLUGIN';
export class SheetPermissionInterceptorBaseController extends Disposable {
disposableCollection = new DisposableCollection();
- private _showPermissionDialog = true;
-
constructor(
@ICommandService private readonly _commandService: ICommandService,
@IUniverInstanceService private readonly _univerInstanceService: IUniverInstanceService,
@@ -64,10 +62,6 @@ export class SheetPermissionInterceptorBaseController extends Disposable {
this._initialize();
}
- setShowPermissionDialog(value: boolean) {
- this._showPermissionDialog = value;
- }
-
public haveNotPermissionHandle(errorMsg: string) {
const dialogProps = {
id: UNIVER_SHEET_PERMISSION_ALERT_DIALOG_ID,
@@ -81,7 +75,7 @@ export class SheetPermissionInterceptorBaseController extends Disposable {
onClose: () => this._dialogService.close(UNIVER_SHEET_PERMISSION_ALERT_DIALOG_ID),
className: 'sheet-permission-user-dialog',
};
- if (this._showPermissionDialog) {
+ if (this._permissionService.getShowComponents()) {
this._dialogService.open(dialogProps);
}
throw new CustomCommandExecutionError('have not permission');