Browse Source

Merge pull request #19705 from abpframework/auto-merge/prerel-8-2/2682

Merge branch dev with prerel-8.2
pull/19708/head
maliming 2 years ago
committed by GitHub
parent
commit
eef969384d
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 8
      npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.ts

8
npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.ts

@ -206,8 +206,12 @@ export class ExtensibleTableComponent<R = any> implements OnChanges {
}); });
} }
hasAvailableActions(index, row): boolean { hasAvailableActions(index, data): boolean {
const { permission, visible } = this.actionList.get(index).value; const { permission, visible } = this.actionList.get(index).value;
return this.permissionService.getGrantedPolicy(permission) && visible(row); let isActionAvailable = this.permissionService.getGrantedPolicy(permission);
if (data && data.record) {
isActionAvailable &&= visible(data);
}
return isActionAvailable;
} }
} }

Loading…
Cancel
Save