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): optimize permission calculation logic in dv (#2811)

ybzkyd127e02881a1
diff --git a/packages/sheets-data-validation/src/views/list/index.tsx b/packages/sheets-data-validation/src/views/list/index.tsx
index dd5121660d..da5a2bf655 100644
--- a/packages/sheets-data-validation/src/views/list/index.tsx
+++ b/packages/sheets-data-validation/src/views/list/index.tsx
@@ -16,12 +16,11 @@
import React, { useEffect, useState } from 'react';
import { ICommandService, Injector, IUniverInstanceService, LocaleService, UniverInstanceType, useDependency } from '@univerjs/core';
-import type { ICellDataForSheetInterceptor, ISheetDataValidationRule, Workbook } from '@univerjs/core';
+import type { ISheetDataValidationRule, Workbook } from '@univerjs/core';
import { createDefaultNewRule, DataValidationModel, RemoveAllDataValidationCommand } from '@univerjs/data-validation';
import { Button } from '@univerjs/design';
import { useObservable } from '@univerjs/ui';
-import type { ICellPermission } from '@univerjs/sheets';
-import { UnitAction } from '@univerjs/protocol';
+import { checkRangesEditablePermission } from '@univerjs/sheets';
import { DataValidationItem } from '../item';
import type { IAddSheetDataValidationCommandParams } from '../../commands/commands/data-validation.command';
import { AddSheetDataValidationCommand } from '../../commands/commands/data-validation.command';
@@ -93,26 +92,17 @@ function DataValidationListWithWorkbook(props: { workbook: Workbook }) {
const getDvRulesByPermissionCorrect = (rules: ISheetDataValidationRule[]) => {
const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
const worksheet = workbook.getActiveSheet();
+ const unitId = workbook.getUnitId();
+ const subUnitId = worksheet.getSheetId();
const rulesByPermissionCheck = rules.map((rule) => {
- const { ranges } = rule;
- const haveNotPermission = ranges?.some((range) => {
- const { startRow, startColumn, endRow, endColumn } = range;
- for (let row = startRow; row <= endRow; row++) {
- for (let col = startColumn; col <= endColumn; col++) {
- const permission = (worksheet?.getCell(row, col) as (ICellDataForSheetInterceptor & { selectionProtection: ICellPermission[] }))?.selectionProtection?.[0];
- if (permission?.[UnitAction.Edit] === false || permission?.[UnitAction.View] === false) {
- return true;
- }
- }
- }
- return false;
- });
- if (haveNotPermission) {
- return { ...rule, disable: true };
- } else {
+ const hasPermission = checkRangesEditablePermission(injector, unitId, subUnitId, rule.ranges);
+ if (hasPermission) {
return { ...rule };
+ } else {
+ return { ...rule, disable: true };
}
});
+
return rulesByPermissionCheck;
};