Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: fix some permission bugs #2522

Merged
merged 3 commits into from
Jun 14, 2024
Merged

fix: fix some permission bugs #2522

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7abd631
fix: fix some permission bugs
ybzky Jun 14, 2024
ccb6a1c
fix: fix permission name
ybzky Jun 14, 2024
6f766a1
fix: change err msg
ybzky Jun 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: fix permission name
  • Loading branch information
@ybzky
ybzky committed Jun 14, 2024
commit ccb6a1c74fb322294f9a6e815d0649e00c1b2c67
8 changes: 4 additions & 4 deletions packages/sheets-ui/src/views/permission/panel-list/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,10 +225,10 @@ export const SheetPermissionPanelList = () => {

const hasManagerPermission = manageCollaboratorAction || currentUser.userID === item.creator?.userID;

const worksheet = workbook.getActiveSheet();

let ruleName = '';

const targetSheet = workbook.getSheetBySheetId(rule.subUnitId);
const targetName = targetSheet?.getName();
if (rule.unitType === UnitObject.SelectRange) {
const ranges = (rule as IRangeProtectionRule).ranges;
const rangeStr = ranges?.length
Expand All @@ -237,9 +237,9 @@ export const SheetPermissionPanelList = () => {
return v === 'NaN' ? '' : v;
}).filter((r) => !!r).join(',')
: '';
ruleName = `${worksheet.getName()}(${rangeStr})`;
ruleName = `${targetName}(${rangeStr})`;
} else if (rule.unitType === UnitObject.Worksheet) {
ruleName = worksheet.getName();
ruleName = targetName || '';
}

return (
Expand Down
Loading