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.
TypeScript boardcollaborationdocdocxexceloffce365officepdfpptpptxpresentationsdksheetslidesspreadsheetuniverwordwordprocessorworkspacexlsx
fix: some operations can be performed when have view permission (#3180)
ybzky8664a7517116
diff --git a/packages/sheets-filter-ui/src/controllers/sheets-filter-permission.controller.ts b/packages/sheets-filter-ui/src/controllers/sheets-filter-permission.controller.tsindex 1e6003b93a..74b9c71610 100644--- a/packages/sheets-filter-ui/src/controllers/sheets-filter-permission.controller.ts+++ b/packages/sheets-filter-ui/src/controllers/sheets-filter-permission.controller.ts@@ -15,15 +15,15 @@*/import type { ICommandInfo } from '@univerjs/core';-import { Disposable, ICommandService, Inject, LocaleService, Tools } from '@univerjs/core';+import { Disposable, ICommandService, Inject, Injector, IUniverInstanceService, LocaleService, Tools } from '@univerjs/core';import type { MenuConfig } from '@univerjs/ui';import { SheetPermissionInterceptorBaseController } from '@univerjs/sheets-ui';import { SheetsFilterService } from '@univerjs/sheets-filter';-import { RangeProtectionPermissionViewPoint, WorkbookEditablePermission, WorksheetEditPermission, WorksheetFilterPermission } from '@univerjs/sheets';-import { SmartToggleSheetsFilterCommand } from '../commands/commands/sheets-filter.command';+import { getSheetCommandTarget, RangeProtectionPermissionViewPoint, WorksheetFilterPermission, WorksheetViewPermission } from '@univerjs/sheets';import { type IOpenFilterPanelOperationParams, OpenFilterPanelOperation } from '../commands/operations/sheets-filter.operation';+import { SmartToggleSheetsFilterCommand } from '../commands/commands/sheets-filter.command';export interface IUniverSheetsFilterUIConfig {menu: MenuConfig;@@ -42,7 +42,8 @@ export class SheetsFilterPermissionController extends Disposable {@Inject(LocaleService) private _localeService: LocaleService,@ICommandService private readonly _commandService: ICommandService,@Inject(SheetPermissionInterceptorBaseController)- private readonly _sheetPermissionInterceptorBaseController: SheetPermissionInterceptorBaseController+ private readonly _sheetPermissionInterceptorBaseController: SheetPermissionInterceptorBaseController,+ @Inject(Injector) private _injector: Injector) {super();@@ -53,11 +54,24 @@ export class SheetsFilterPermissionController extends Disposable {this.disposeWithMe(this._commandService.beforeCommandExecuted((command: ICommandInfo) => {if (command.id === SmartToggleSheetsFilterCommand.id) {- const permission = this._sheetPermissionInterceptorBaseController.permissionCheckWithoutRange({- workbookTypes: [WorkbookEditablePermission],- rangeTypes: [RangeProtectionPermissionViewPoint],- worksheetTypes: [WorksheetFilterPermission, WorksheetEditPermission],- });+ const univerInstanceService = this._injector.get(IUniverInstanceService);+ const target = getSheetCommandTarget(univerInstanceService);+ if (!target) return;+ const { unitId, subUnitId } = target;+ const filterRange = this._sheetsFilterService.getFilterModel(unitId, subUnitId)?.getRange();+ let permission;+ if (filterRange) {+ permission = this._sheetPermissionInterceptorBaseController.permissionCheckWithRanges({+ rangeTypes: [RangeProtectionPermissionViewPoint],+ worksheetTypes: [WorksheetFilterPermission, WorksheetViewPermission],+ }, [filterRange]);+ } else {+ permission = this._sheetPermissionInterceptorBaseController.permissionCheckWithoutRange({+ rangeTypes: [RangeProtectionPermissionViewPoint],+ worksheetTypes: [WorksheetViewPermission, WorksheetFilterPermission],+ });+ }+if (!permission) {this._sheetPermissionInterceptorBaseController.haveNotPermissionHandle(this._localeService.t('permission.dialog.filterErr'));}@@ -71,9 +85,8 @@ export class SheetsFilterPermissionController extends Disposable {colRange.startColumn = params.col;colRange.endColumn = params.col;const permission = this._sheetPermissionInterceptorBaseController.permissionCheckWithRanges({- workbookTypes: [WorkbookEditablePermission],rangeTypes: [RangeProtectionPermissionViewPoint],- worksheetTypes: [WorksheetFilterPermission, WorksheetEditPermission],+ worksheetTypes: [WorksheetFilterPermission, WorksheetViewPermission],}, [colRange]);if (!permission) {this._sheetPermissionInterceptorBaseController.haveNotPermissionHandle(this._localeService.t('permission.dialog.filterErr'));diff --git a/packages/sheets-filter-ui/src/controllers/sheets-filter.menu.ts b/packages/sheets-filter-ui/src/controllers/sheets-filter.menu.tsindex d23d8d34cc..65342e6c87 100644--- a/packages/sheets-filter-ui/src/controllers/sheets-filter.menu.ts+++ b/packages/sheets-filter-ui/src/controllers/sheets-filter.menu.ts@@ -22,7 +22,7 @@ import { UniverInstanceType } from '@univerjs/core';import { map, of, switchMap } from 'rxjs';import { getCurrentRangeDisable$ } from '@univerjs/sheets-ui';-import { RangeProtectionPermissionEditPoint, WorkbookEditablePermission, WorksheetEditPermission, WorksheetFilterPermission } from '@univerjs/sheets';+import { RangeProtectionPermissionViewPoint, WorksheetFilterPermission, WorksheetViewPermission } from '@univerjs/sheets';import { ClearSheetsFilterCriteriaCommand, ReCalcSheetsFilterCommand, SmartToggleSheetsFilterCommand } from '../commands/commands/sheets-filter.command';export function SmartToggleFilterMenuItemFactory(accessor: IAccessor): IMenuSelectorItem {@@ -37,7 +37,7 @@ export function SmartToggleFilterMenuItemFactory(accessor: IAccessor): IMenuSelepositions: [MenuPosition.TOOLBAR_START],hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),activated$: sheetsFilterService.activeFilterModel$.pipe(map((model) => !!model)),- disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetFilterPermission, WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),+ disabled$: getCurrentRangeDisable$(accessor, { worksheetTypes: [WorksheetFilterPermission, WorksheetViewPermission], rangeTypes: [RangeProtectionPermissionViewPoint] }),};}diff --git a/packages/sheets-ui/src/controllers/menu/menu.ts b/packages/sheets-ui/src/controllers/menu/menu.tsindex 33930afb0f..39bbaa5625 100644--- a/packages/sheets-ui/src/controllers/menu/menu.ts+++ b/packages/sheets-ui/src/controllers/menu/menu.ts@@ -1077,7 +1077,7 @@ export function FrozenMenuItemFactory(accessor: IAccessor): IMenuButtonItem {positions: [SHEET_FROZEN_MENU_ID, SHEET_FROZEN_HEADER_MENU_ID],title: 'rightClick.freeze',icon: 'FreezeToSelectedSingle',- disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),+ // disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),};}@@ -1089,7 +1089,7 @@ export function FrozenRowMenuItemFactory(accessor: IAccessor): IMenuButtonItem {positions: [SHEET_FROZEN_MENU_ID],title: 'rightClick.freezeRow',icon: 'FreezeRowSingle',- disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),+ // disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),};}@@ -1101,7 +1101,7 @@ export function FrozenColMenuItemFactory(accessor: IAccessor): IMenuButtonItem {positions: [SHEET_FROZEN_MENU_ID],title: 'rightClick.freezeCol',icon: 'FreezeColumnSingle',- disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),+ // disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),};}@@ -1113,7 +1113,7 @@ export function CancelFrozenMenuItemFactory(accessor: IAccessor): IMenuButtonItepositions: [SHEET_FROZEN_MENU_ID, SHEET_FROZEN_HEADER_MENU_ID],title: 'rightClick.cancelFreeze',icon: 'CancelFreezeSingle',- disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),+ // disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),};}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.tsindex 29aa578d01..ba441306b3 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@@ -50,7 +50,7 @@ export class SheetPermissionInterceptorCanvasRenderController extends RxDisposabthis._initHeaderResizePermissionInterceptor();this._initRangeFillPermissionInterceptor();this._initRangeMovePermissionInterceptor();- this._initFreezePermissionInterceptor();+ // this._initFreezePermissionInterceptor();}private _initHeaderMovePermissionInterceptor() {diff --git a/packages/sheets-ui/src/controllers/render-controllers/freeze.render-controller.ts b/packages/sheets-ui/src/controllers/render-controllers/freeze.render-controller.tsindex 948e77fd90..d12b9136e1 100644--- a/packages/sheets-ui/src/controllers/render-controllers/freeze.render-controller.ts+++ b/packages/sheets-ui/src/controllers/render-controllers/freeze.render-controller.ts@@ -307,7 +307,7 @@ export class HeaderFreezeRenderController extends Disposable implements IRenderMif (freezeObjectMainRect) {const _freezeObjectMainRectEnterSub = freezeObjectMainRect.onPointerEnter$.subscribeEvent(() => {- const permissionCheck = this.interceptor.fetchThroughInterceptors(FREEZE_PERMISSION_CHECK)(null, null);+ const permissionCheck = this.interceptor.fetchThroughInterceptors(FREEZE_PERMISSION_CHECK)(true, null);if (!permissionCheck) {return false;}@@ -332,7 +332,7 @@ export class HeaderFreezeRenderController extends Disposable implements IRenderMif (freezeObjectHeaderRect) {const _freezeObjHeaderPointerEnterSub = freezeObjectHeaderRect.onPointerEnter$.subscribeEvent(() => {- const permissionCheck = this.interceptor.fetchThroughInterceptors(FREEZE_PERMISSION_CHECK)(null, null);+ const permissionCheck = this.interceptor.fetchThroughInterceptors(FREEZE_PERMISSION_CHECK)(true, null);if (!permissionCheck) {return false;}@@ -479,7 +479,7 @@ export class HeaderFreezeRenderController extends Disposable implements IRenderMreturn;}- const permissionCheck = this.interceptor.fetchThroughInterceptors(FREEZE_PERMISSION_CHECK)(null, null);+ const permissionCheck = this.interceptor.fetchThroughInterceptors(FREEZE_PERMISSION_CHECK)(true, null);if (!permissionCheck) {return false;}@@ -512,7 +512,7 @@ export class HeaderFreezeRenderController extends Disposable implements IRenderMtrue);- const permissionCheck = this.interceptor.fetchThroughInterceptors(FREEZE_PERMISSION_CHECK)(null, null);+ const permissionCheck = this.interceptor.fetchThroughInterceptors(FREEZE_PERMISSION_CHECK)(true, null);if (!permissionCheck) {return false;}