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.

fix(permission): fix permission render bugs (#3300)

ybzky9751c0a81529
diff --git a/packages/sheets-ui/src/controllers/editor/formula-editor.controller.ts b/packages/sheets-ui/src/controllers/editor/formula-editor.controller.ts
index bf87049423..922eb7c021 100644
--- a/packages/sheets-ui/src/controllers/editor/formula-editor.controller.ts
+++ b/packages/sheets-ui/src/controllers/editor/formula-editor.controller.ts
@@ -45,7 +45,7 @@ import {
import type { DocumentViewModel, RenderComponentType } from '@univerjs/engine-render';
import { DeviceInputEventType, IRenderManagerService, ScrollBar } from '@univerjs/engine-render';
import type { IMoveRangeMutationParams, ISetRangeValuesMutationParams } from '@univerjs/sheets';
-import { MoveRangeMutation, SetRangeValuesMutation } from '@univerjs/sheets';
+import { MoveRangeMutation, RangeProtectionRuleModel, SetRangeValuesMutation, WorksheetProtectionRuleModel } from '@univerjs/sheets';
import { takeUntil } from 'rxjs';
import { SetEditorResizeOperation } from '@univerjs/ui';
@@ -66,7 +66,9 @@ export class FormulaEditorController extends RxDisposable {
@IContextService private readonly _contextService: IContextService,
@IFormulaEditorManagerService private readonly _formulaEditorManagerService: IFormulaEditorManagerService,
@IUndoRedoService private readonly _undoRedoService: IUndoRedoService,
- @Inject(TextSelectionManagerService) private readonly _textSelectionManagerService: TextSelectionManagerService
+ @Inject(TextSelectionManagerService) private readonly _textSelectionManagerService: TextSelectionManagerService,
+ @Inject(RangeProtectionRuleModel) private readonly _rangeProtectionRuleModel: RangeProtectionRuleModel,
+ @Inject(WorksheetProtectionRuleModel) private readonly _worksheetProtectionRuleModel: WorksheetProtectionRuleModel
) {
super();
@@ -245,7 +247,13 @@ export class FormulaEditorController extends RxDisposable {
// Sync cell content to formula editor bar when sheet selection changed.
private _syncFormulaEditorContent() {
this._editorBridgeService.currentEditCellState$.pipe(takeUntil(this.dispose$)).subscribe((editCellState) => {
- if (editCellState == null || this._editorBridgeService.isForceKeepVisible()) {
+ if (
+ editCellState == null
+ || this._editorBridgeService.isForceKeepVisible()
+ // If permissions are not initialized, data synchronization will not be performed.
+ || !this._rangeProtectionRuleModel.getRangeRuleInitState()
+ || !this._worksheetProtectionRuleModel.getSheetRuleInitState()
+ ) {
return;
}
diff --git a/packages/sheets-ui/src/controllers/permission/sheet-permission-init.controller.ts b/packages/sheets-ui/src/controllers/permission/sheet-permission-init.controller.ts
index 4c2bc12683..048b006f2a 100644
--- a/packages/sheets-ui/src/controllers/permission/sheet-permission-init.controller.ts
+++ b/packages/sheets-ui/src/controllers/permission/sheet-permission-init.controller.ts
@@ -15,10 +15,10 @@
*/
import type { Workbook } from '@univerjs/core';
-import { Disposable, IAuthzIoService, Inject, IPermissionService, IUndoRedoService, IUniverInstanceService, LifecycleStages, OnLifecycle, UniverInstanceType, UserManagerService } from '@univerjs/core';
+import { Disposable, IAuthzIoService, ICommandService, Inject, IPermissionService, IUndoRedoService, IUniverInstanceService, LifecycleStages, OnLifecycle, UniverInstanceType, UserManagerService } from '@univerjs/core';
-import type { IRangeProtectionRule, IWorksheetProtectionRenderCellData } from '@univerjs/sheets';
-import { defaultWorkbookPermissionPoints, defaultWorksheetPermissionPoint, getAllRangePermissionPoint, getAllWorkbookPermissionPoint, getAllWorksheetPermissionPoint, getAllWorksheetPermissionPointByPointPanel, INTERCEPTOR_POINT, RangeProtectionRenderModel, RangeProtectionRuleModel, SheetInterceptorService, WorksheetEditPermission, WorksheetProtectionPointModel, WorksheetProtectionRuleModel, WorksheetViewPermission } from '@univerjs/sheets';
+import type { IAddRangeProtectionMutationParams, IAddWorksheetProtectionParams, IRangeProtectionRule, ISetWorksheetPermissionPointsMutationParams, IWorksheetProtectionRenderCellData } from '@univerjs/sheets';
+import { AddRangeProtectionMutation, AddWorksheetProtectionMutation, defaultWorkbookPermissionPoints, defaultWorksheetPermissionPoint, getAllRangePermissionPoint, getAllWorkbookPermissionPoint, getAllWorksheetPermissionPoint, getAllWorksheetPermissionPointByPointPanel, INTERCEPTOR_POINT, RangeProtectionRenderModel, RangeProtectionRuleModel, SetWorksheetPermissionPointsMutation, SheetInterceptorService, WorksheetEditPermission, WorksheetProtectionPointModel, WorksheetProtectionRuleModel, WorksheetViewPermission } from '@univerjs/sheets';
import { IDialogService } from '@univerjs/ui';
import { UnitAction, UnitObject } from '@univerjs/protocol';
@@ -39,7 +39,8 @@ export class SheetPermissionInitController extends Disposable {
@Inject(WorksheetProtectionPointModel) private _worksheetProtectionPointRuleModel: WorksheetProtectionPointModel,
@Inject(SheetInterceptorService) private _sheetInterceptorService: SheetInterceptorService,
@Inject(RangeProtectionRenderModel) private _selectionProtectionRenderModel: RangeProtectionRenderModel,
- @Inject(IUndoRedoService) private _undoRedoService: IUndoRedoService
+ @Inject(IUndoRedoService) private _undoRedoService: IUndoRedoService,
+ @Inject(ICommandService) private _commandService: ICommandService
) {
super();
this._initRangePermissionFromSnapshot();
@@ -51,10 +52,11 @@ export class SheetPermissionInitController extends Disposable {
this._initUserChange();
this._initViewModelByRangeInterceptor();
this._initViewModelBySheetInterceptor();
+ this._refreshPermissionByCollaCreate();
}
- private _initRangePermissionFromSnapshot() {
- const initRangePermissionFunc = (workbook: Workbook) => {
+ private async _initRangePermissionFromSnapshot() {
+ const initRangePermissionFunc = async (workbook: Workbook) => {
const allAllowedParams: {
objectID: string;
unitID: string;
@@ -78,6 +80,7 @@ export class SheetPermissionInitController extends Disposable {
});
if (!allAllowedParams.length) {
+ this._rangeProtectionRuleModel.changeRuleInitState(true);
return;
}
@@ -95,12 +98,12 @@ export class SheetPermissionInitController extends Disposable {
});
}
});
+ this._rangeProtectionRuleModel.changeRuleInitState(true);
});
};
- this._univerInstanceService.getAllUnitsForType<Workbook>(UniverInstanceType.UNIVER_SHEET).forEach((workbook) => {
- initRangePermissionFunc(workbook);
- });
+ await Promise.all(this._univerInstanceService.getAllUnitsForType<Workbook>(UniverInstanceType.UNIVER_SHEET).map((workbook) => initRangePermissionFunc(workbook)));
+ this._rangeProtectionRuleModel.changeRuleInitState(true);
}
private _initRangePermissionChange() {
@@ -144,7 +147,7 @@ export class SheetPermissionInitController extends Disposable {
);
}
- public initWorkbookPermissionChange(_unitId?: string) {
+ public async initWorkbookPermissionChange(_unitId?: string) {
const unitId = _unitId || this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)?.getUnitId();
if (!unitId) {
return;
@@ -166,10 +169,8 @@ export class SheetPermissionInitController extends Disposable {
});
}
- private _initWorkbookPermissionFromSnapshot() {
- this._univerInstanceService.getAllUnitsForType<Workbook>(UniverInstanceType.UNIVER_SHEET).forEach((workbook) => {
- this.initWorkbookPermissionChange(workbook.getUnitId());
- });
+ private async _initWorkbookPermissionFromSnapshot() {
+ await Promise.all(this._univerInstanceService.getAllUnitsForType<Workbook>(UniverInstanceType.UNIVER_SHEET).map((workbook) => this.initWorkbookPermissionChange(workbook.getUnitId())));
}
private _initWorksheetPermissionChange() {
@@ -224,8 +225,8 @@ export class SheetPermissionInitController extends Disposable {
);
}
- private _initWorksheetPermissionFromSnapshot() {
- const initSheetPermissionFunc = (workbook: Workbook) => {
+ private async _initWorksheetPermissionFromSnapshot() {
+ const initSheetPermissionFunc = async (workbook: Workbook) => {
const allAllowedParams: {
objectID: string;
unitID: string;
@@ -261,6 +262,7 @@ export class SheetPermissionInitController extends Disposable {
});
if (!allAllowedParams.length) {
+ this._worksheetProtectionRuleModel.changeRuleInitState(true);
return;
}
@@ -278,12 +280,12 @@ export class SheetPermissionInitController extends Disposable {
});
}
});
+ this._worksheetProtectionRuleModel.changeRuleInitState(true);
});
};
- this._univerInstanceService.getAllUnitsForType<Workbook>(UniverInstanceType.UNIVER_SHEET).forEach((workbook) => {
- initSheetPermissionFunc(workbook);
- });
+ await Promise.all(this._univerInstanceService.getAllUnitsForType<Workbook>(UniverInstanceType.UNIVER_SHEET).map((workbook) => initSheetPermissionFunc(workbook)));
+ this._worksheetProtectionRuleModel.changeRuleInitState(true);
}
private _initUserChange() {
@@ -488,4 +490,21 @@ export class SheetPermissionInitController extends Disposable {
});
}
}
+
+ private _refreshPermissionByCollaCreate() {
+ this.disposeWithMe(
+ this._commandService.onCommandExecuted((command, options) => {
+ if (options?.fromCollab) {
+ if (
+ command.id === AddRangeProtectionMutation.id
+ || command.id === AddWorksheetProtectionMutation.id
+ || command.id === SetWorksheetPermissionPointsMutation.id
+ ) {
+ const params = command.params as IAddRangeProtectionMutationParams | IAddWorksheetProtectionParams | ISetWorksheetPermissionPointsMutationParams;
+ this._undoRedoService.clearUndoRedo(params.unitId);
+ }
+ }
+ })
+ );
+ }
}
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 297b9ba156..01d3c1b739 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
@@ -41,7 +41,7 @@ type ICheckPermissionCommandParams = IEditorBridgeServiceVisibleParam | IMoveRow
export const SHEET_PERMISSION_PASTE_PLUGIN = 'SHEET_PERMISSION_PASTE_PLUGIN';
-@OnLifecycle(LifecycleStages.Steady, SheetPermissionInterceptorBaseController)
+@OnLifecycle(LifecycleStages.Ready, SheetPermissionInterceptorBaseController)
export class SheetPermissionInterceptorBaseController extends Disposable {
disposableCollection = new DisposableCollection();
@@ -170,7 +170,6 @@ export class SheetPermissionInterceptorBaseController extends Disposable {
errorMsg = this._localeService.t('permission.dialog.setStyleErr');
break;
case SheetCopyCommand.id:
- case SheetCutCommand.id:
permission = this.permissionCheckWithRanges({
workbookTypes: [WorkbookCopyPermission],
rangeTypes: [RangeProtectionPermissionViewPoint],
@@ -181,6 +180,17 @@ export class SheetPermissionInterceptorBaseController extends Disposable {
errorMsg = this._localeService.t('permission.dialog.workbookCopyErr');
}
break;
+ case SheetCutCommand.id:
+ permission = this.permissionCheckWithRanges({
+ workbookTypes: [WorkbookCopyPermission, WorkbookEditablePermission],
+ rangeTypes: [RangeProtectionPermissionViewPoint, RangeProtectionPermissionEditPoint],
+ worksheetTypes: [WorksheetCopyPermission, WorksheetEditPermission],
+ });
+ errorMsg = this._localeService.t('permission.dialog.copyErr');
+ if (!this._permissionService.getPermissionPoint(new WorkbookCopyPermission(this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!.getUnitId()).id)?.value) {
+ errorMsg = this._localeService.t('permission.dialog.workbookCopyErr');
+ }
+ break;
case DeltaColumnWidthCommand.id:
case SetColWidthCommand.id:
permission = this.permissionCheckWithoutRange({
diff --git a/packages/sheets-ui/src/controllers/permission/sheet-permission-interceptor-canvas-render.controller.ts b/packages/sheets-ui/src/controllers/permission/sheet-permission-interceptor-canvas-render.controller.ts
index ba441306b3..a99f0aaac1 100644
--- a/packages/sheets-ui/src/controllers/permission/sheet-permission-interceptor-canvas-render.controller.ts
+++ b/packages/sheets-ui/src/controllers/permission/sheet-permission-interceptor-canvas-render.controller.ts
@@ -15,7 +15,7 @@
*/
import type { ICellDataForSheetInterceptor, IRange, Nullable, Workbook } from '@univerjs/core';
-import { getSheetCommandTarget, RangeProtectionRuleModel, SheetsSelectionsService, WorkbookEditablePermission, WorksheetEditPermission, WorksheetSetColumnStylePermission, WorksheetSetRowStylePermission } from '@univerjs/sheets';
+import { getSheetCommandTarget, RangeProtectionRuleModel, SheetsSelectionsService, WorkbookEditablePermission, WorksheetEditPermission, WorksheetSetCellStylePermission, WorksheetSetCellValuePermission, WorksheetSetColumnStylePermission, WorksheetSetRowStylePermission } from '@univerjs/sheets';
import { DisposableCollection, Inject, IPermissionService, IUniverInstanceService, LifecycleStages, OnLifecycle, Optional, RANGE_TYPE, Rectangle, RxDisposable, UniverInstanceType } from '@univerjs/core';
import type { IRenderContext, IRenderModule, Scene, SpreadsheetSkeleton } from '@univerjs/engine-render';
@@ -238,7 +238,12 @@ export class SheetPermissionInterceptorCanvasRenderController extends RxDisposab
}
const { worksheet, unitId, subUnitId } = target;
- const worksheetEditPermission = this._permissionService.composePermission([new WorkbookEditablePermission(unitId).id, new WorksheetEditPermission(unitId, subUnitId).id]).every((permission) => permission.value);
+ const worksheetEditPermission = this._permissionService.composePermission([
+ new WorkbookEditablePermission(unitId).id,
+ new WorksheetEditPermission(unitId, subUnitId).id,
+ new WorksheetSetCellValuePermission(unitId, subUnitId).id,
+ new WorksheetSetCellStylePermission(unitId, subUnitId).id,
+ ]).every((permission) => permission.value);
if (!worksheetEditPermission) {
return false;
}
diff --git a/packages/sheets-ui/src/controllers/permission/sheet-permission-render.controller.ts b/packages/sheets-ui/src/controllers/permission/sheet-permission-render.controller.ts
index 0e8cbd5a03..7b82b7dd19 100644
--- a/packages/sheets-ui/src/controllers/permission/sheet-permission-render.controller.ts
+++ b/packages/sheets-ui/src/controllers/permission/sheet-permission-render.controller.ts
@@ -14,12 +14,13 @@
* limitations under the License.
*/
-import { Disposable, Inject, IPermissionService } from '@univerjs/core';
+import { Disposable, Inject, IPermissionService, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';
import type { MenuConfig } from '@univerjs/ui';
import { ComponentManager } from '@univerjs/ui';
import { CheckMarkSingle, DeleteSingle, LockSingle, ProtectSingle, WriteSingle } from '@univerjs/icons';
-import { RangeProtectionRuleModel } from '@univerjs/sheets';
+import { RangeProtectionRuleModel, WorksheetProtectionRuleModel } from '@univerjs/sheets';
import type { IRenderContext, IRenderModule, Spreadsheet } from '@univerjs/engine-render';
+import { IRenderManagerService } from '@univerjs/engine-render';
import { merge, throttleTime } from 'rxjs';
import { permissionCheckIconKey, permissionDeleteIconKey, permissionEditIconKey, permissionLockIconKey, permissionMenuIconKey, UNIVER_SHEET_PERMISSION_DIALOG, UNIVER_SHEET_PERMISSION_PANEL, UNIVER_SHEET_PERMISSION_PANEL_FOOTER, UNIVER_SHEET_PERMISSION_USER_DIALOG } from '../../consts/permission';
import { SheetPermissionDialog, SheetPermissionPanel, SheetPermissionPanelFooter, SheetPermissionUserDialog } from '../../views/permission';
@@ -27,6 +28,7 @@ import { UNIVER_SHEET_PERMISSION_ALERT_DIALOG } from '../../views/permission/err
import { AlertDialog } from '../../views/permission/error-msg-dialog';
import { SheetSkeletonManagerService } from '../../services/sheet-skeleton-manager.service';
import { RANGE_PROTECTION_CAN_NOT_VIEW_RENDER_EXTENSION_KEY, RANGE_PROTECTION_CAN_VIEW_RENDER_EXTENSION_KEY, RangeProtectionCanNotViewRenderExtension, RangeProtectionCanViewRenderExtension } from '../../views/permission/extensions/range-protection.render';
+import { worksheetProtectionKey, WorksheetProtectionRenderExtension } from '../../views/permission/extensions/worksheet-permission.render';
export interface IUniverSheetsPermissionMenuConfig {
menu: MenuConfig;
@@ -108,7 +110,54 @@ export class SheetPermissionRenderController extends Disposable implements IRend
this.disposeWithMe(merge(
this._permissionService.permissionPointUpdate$.pipe(throttleTime(300, undefined, { trailing: true })),
+ this._rangeProtectionRuleModel.rangeRuleInitStateChange$,
this._rangeProtectionRuleModel.ruleChange$
).pipe().subscribe(markDirtySkeleton));
}
}
+
+export class WorksheetProtectionRenderController extends Disposable implements IRenderModule {
+ private _worksheetProtectionRenderExtension = new WorksheetProtectionRenderExtension();
+ constructor(
+ private readonly _context: IRenderContext,
+ @Inject(IRenderManagerService) private _renderManagerService: IRenderManagerService,
+ @Inject(IUniverInstanceService) private _univerInstanceService: IUniverInstanceService,
+ @Inject(SheetSkeletonManagerService) private _sheetSkeletonManagerService: SheetSkeletonManagerService,
+ @Inject(WorksheetProtectionRuleModel) private _worksheetProtectionRuleModel: WorksheetProtectionRuleModel
+
+ ) {
+ super();
+ this._initRender();
+ this._initSkeleton();
+ }
+
+ private _initRender() {
+ const register = (renderId: string) => {
+ const render = renderId && this._renderManagerService.getRenderById(renderId);
+ const spreadsheetRender = render && render.mainComponent as Spreadsheet;
+ if (spreadsheetRender) {
+ if (!spreadsheetRender.getExtensionByKey(worksheetProtectionKey)) {
+ spreadsheetRender.register(this._worksheetProtectionRenderExtension);
+ }
+ }
+ };
+ this.disposeWithMe(this._renderManagerService.currentRender$.subscribe((renderId) => {
+ renderId && register(renderId);
+ }));
+ const workbook = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET)!;
+ if (workbook) {
+ register(workbook.getUnitId());
+ }
+ }
+
+ private _initSkeleton(): void {
+ const markDirtySkeleton = () => {
+ this._sheetSkeletonManagerService.reCalculate();
+ this._context.mainComponent?.makeDirty();
+ };
+
+ this.disposeWithMe(merge(
+ this._worksheetProtectionRuleModel.worksheetRuleInitStateChange$
+ ).pipe().subscribe(markDirtySkeleton));
+ }
+}
diff --git a/packages/sheets-ui/src/mobile-sheets-ui-plugin.ts b/packages/sheets-ui/src/mobile-sheets-ui-plugin.ts
index 9ed89b02bf..a23828157c 100644
--- a/packages/sheets-ui/src/mobile-sheets-ui-plugin.ts
+++ b/packages/sheets-ui/src/mobile-sheets-ui-plugin.ts
@@ -55,12 +55,11 @@ import { DragManagerService } from './services/drag-manager.service';
import { SheetPermissionInterceptorClipboardController } from './controllers/permission/sheet-permission-interceptor-clipboard.controller';
import { SheetPermissionInterceptorBaseController } from './controllers/permission/sheet-permission-interceptor-base.controller';
import { SheetPermissionInitController } from './controllers/permission/sheet-permission-init.controller';
-import { SheetPermissionRenderController, SheetPermissionRenderManagerController } from './controllers/permission/sheet-permission-render.controller';
+import { SheetPermissionRenderController, SheetPermissionRenderManagerController, WorksheetProtectionRenderController } from './controllers/permission/sheet-permission-render.controller';
import { SheetPermissionInterceptorCanvasRenderController } from './controllers/permission/sheet-permission-interceptor-canvas-render.controller';
import { SheetPermissionInterceptorFormulaRenderController } from './controllers/permission/sheet-permission-interceptor-formula-render.controller';
import { SheetPermissionPanelModel } from './services/permission/sheet-permission-panel.model';
import { SheetPermissionUserManagerService } from './services/permission/sheet-permission-user-list.service';
-import { WorksheetProtectionRenderService } from './services/permission/worksheet-permission-render.service';
import { SheetPrintInterceptorService } from './services/print-interceptor.service';
import { SheetUIMobileController } from './controllers/mobile/mobile-sheet-ui.controller';
import { SheetContextMenuMobileRenderController } from './controllers/render-controllers/mobile/mobile-contextmenu.render-controller';
@@ -116,7 +115,7 @@ export class UniverSheetsMobileUIPlugin extends Plugin {
// permission
[SheetPermissionPanelModel],
[SheetPermissionUserManagerService],
- [WorksheetProtectionRenderService],
+ [WorksheetProtectionRenderController],
[SheetPermissionInterceptorClipboardController],
[SheetPermissionInterceptorBaseController],
[SheetPermissionInitController],
diff --git a/packages/sheets-ui/src/services/permission/worksheet-permission-render.service.ts b/packages/sheets-ui/src/services/permission/worksheet-permission-render.service.ts
deleted file mode 100644
index 9da6c4cfca..0000000000
--- a/packages/sheets-ui/src/services/permission/worksheet-permission-render.service.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Copyright 2023-present DreamNum Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { Disposable, Inject, IUniverInstanceService, LifecycleStages, OnLifecycle, UniverInstanceType } from '@univerjs/core';
-import { IRenderManagerService } from '@univerjs/engine-render';
-import type { Spreadsheet } from '@univerjs/engine-render';
-import { worksheetProtectionKey, WorksheetProtectionRenderExtension } from '../../views/permission/extensions/worksheet-permission.render';
-
-@OnLifecycle(LifecycleStages.Ready, WorksheetProtectionRenderService)
-export class WorksheetProtectionRenderService extends Disposable {
- private _worksheetProtectionRenderExtension = new WorksheetProtectionRenderExtension();
- constructor(
- @Inject(IRenderManagerService) private _renderManagerService: IRenderManagerService,
- @Inject(IUniverInstanceService) private _univerInstanceService: IUniverInstanceService
-
- ) {
- super();
- this._initRender();
- }
-
- private _initRender() {
- const register = (renderId: string) => {
- const render = renderId && this._renderManagerService.getRenderById(renderId);
- const spreadsheetRender = render && render.mainComponent as Spreadsheet;
- if (spreadsheetRender) {
- if (!spreadsheetRender.getExtensionByKey(worksheetProtectionKey)) {
- spreadsheetRender.register(this._worksheetProtectionRenderExtension);
- }
- }
- };
- this.disposeWithMe(this._renderManagerService.currentRender$.subscribe((renderId) => {
- renderId && register(renderId);
- }));
- const workbook = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET)!;
- if (workbook) {
- register(workbook.getUnitId());
- }
- }
-}
diff --git a/packages/sheets-ui/src/sheets-ui-plugin.ts b/packages/sheets-ui/src/sheets-ui-plugin.ts
index 19574e917b..f4255c2a8f 100644
--- a/packages/sheets-ui/src/sheets-ui-plugin.ts
+++ b/packages/sheets-ui/src/sheets-ui-plugin.ts
@@ -70,12 +70,11 @@ import { DragManagerService } from './services/drag-manager.service';
import { SheetPermissionInterceptorClipboardController } from './controllers/permission/sheet-permission-interceptor-clipboard.controller';
import { SheetPermissionInterceptorBaseController } from './controllers/permission/sheet-permission-interceptor-base.controller';
import { SheetPermissionInitController } from './controllers/permission/sheet-permission-init.controller';
-import { SheetPermissionRenderController, SheetPermissionRenderManagerController } from './controllers/permission/sheet-permission-render.controller';
+import { SheetPermissionRenderController, SheetPermissionRenderManagerController, WorksheetProtectionRenderController } from './controllers/permission/sheet-permission-render.controller';
import { SheetPermissionInterceptorCanvasRenderController } from './controllers/permission/sheet-permission-interceptor-canvas-render.controller';
import { SheetPermissionInterceptorFormulaRenderController } from './controllers/permission/sheet-permission-interceptor-formula-render.controller';
import { SheetPermissionPanelModel } from './services/permission/sheet-permission-panel.model';
import { SheetPermissionUserManagerService } from './services/permission/sheet-permission-user-list.service';
-import { WorksheetProtectionRenderService } from './services/permission/worksheet-permission-render.service';
import { SheetPrintInterceptorService } from './services/print-interceptor.service';
import { SheetsDefinedNameController } from './controllers/defined-name/defined-name.controller';
import { MoveRangeRenderController } from './controllers/move-range.controller';
@@ -143,7 +142,6 @@ export class UniverSheetsUIPlugin extends Plugin {
// permission
[SheetPermissionPanelModel],
[SheetPermissionUserManagerService],
- [WorksheetProtectionRenderService],
[SheetPermissionInterceptorClipboardController],
[SheetPermissionInterceptorBaseController],
[SheetPermissionInitController],
@@ -208,6 +206,7 @@ export class UniverSheetsUIPlugin extends Plugin {
[SheetPermissionInterceptorCanvasRenderController],
[SheetPermissionInterceptorFormulaRenderController],
[SheetPermissionRenderController],
+ [WorksheetProtectionRenderController],
] as Dependency[]).forEach((m) => {
this.disposeWithMe(this._renderManagerService.registerRenderModule(UniverInstanceType.UNIVER_SHEET, m));
});
diff --git a/packages/sheets/src/index.ts b/packages/sheets/src/index.ts
index 0bab067d31..89515a8a1a 100644
--- a/packages/sheets/src/index.ts
+++ b/packages/sheets/src/index.ts
@@ -371,6 +371,7 @@ export { SetWorksheetHideMutation, type ISetWorksheetHideMutationParams } from '
export { SetWorksheetNameMutation, type ISetWorksheetNameMutationParams } from './commands/mutations/set-worksheet-name.mutation';
export { SetWorksheetOrderMutation, type ISetWorksheetOrderMutationParams } from './commands/mutations/set-worksheet-order.mutation';
export { SetWorksheetPermissionPointsMutation } from './commands/mutations/set-worksheet-permission-points.mutation';
+export type { ISetWorksheetPermissionPointsMutationParams } from './commands/mutations/set-worksheet-permission-points.mutation';
export { SetWorksheetProtectionMutation } from './commands/mutations/set-worksheet-protection.mutation';
export { SetWorksheetRightToLeftMutation } from './commands/mutations/set-worksheet-right-to-left.mutation';
export {
diff --git a/packages/sheets/src/model/range-protection-rule.model.ts b/packages/sheets/src/model/range-protection-rule.model.ts
index 0c608c5a76..5b2722348c 100644
--- a/packages/sheets/src/model/range-protection-rule.model.ts
+++ b/packages/sheets/src/model/range-protection-rule.model.ts
@@ -64,6 +64,10 @@ export class RangeProtectionRuleModel {
private _rangeRuleInitStateChange = new BehaviorSubject<boolean>(false);
rangeRuleInitStateChange$ = this._rangeRuleInitStateChange.asObservable();
+ getRangeRuleInitState() {
+ return this._rangeRuleInitStateChange.value;
+ }
+
changeRuleInitState(state: boolean) {
this._rangeRuleInitStateChange.next(state);
}
diff --git a/packages/sheets/src/services/permission/worksheet-permission/worksheet-permission-rule.model.ts b/packages/sheets/src/services/permission/worksheet-permission/worksheet-permission-rule.model.ts
index b5518fe1ae..d097e0e2ce 100644
--- a/packages/sheets/src/services/permission/worksheet-permission/worksheet-permission-rule.model.ts
+++ b/packages/sheets/src/services/permission/worksheet-permission/worksheet-permission-rule.model.ts
@@ -52,6 +52,10 @@ export class WorksheetProtectionRuleModel {
this._worksheetRuleInitStateChange.next(state);
}
+ getSheetRuleInitState() {
+ return this._worksheetRuleInitStateChange.value;
+ }
+
addRule(unitId: string, rule: IWorksheetProtectionRule) {
const subUnitMap = this._ensureSubUnitMap(unitId);
subUnitMap.set(rule.subUnitId, rule);