Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
wangshiming
2022-02-23 19:38:18 +08:00
parent c27874bb3f
commit f40c5a53a4
19 changed files with 520 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/routes/sys-setting/components/role-management/role-management.component.html
View File

@ -8,7 +8,7 @@
[button]="'none'"></sf>
</div>
<div nz-col [nzSpan]="8" nzOffset="1">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)" acl [acl-ability]="['SYSTEM-ROLE-list']">查询</button>
<button nz-button (click)="resetSF()">重置</button>
</div>
</div>
@ -17,7 +17,7 @@
<nz-card>
<div class="d-flex justify-content-end mb-sm">
<div>
<button nz-button nzType="primary" (click)="roleAction()">新建角色</button>
<button nz-button nzType="primary" (click)="roleAction()" acl [acl-ability]="['SYSTEM-ROLE-add']">新建角色</button>
</div>
</div>
<st #st [data]="params.listUrl" [columns]="columns" [req]="{ process: beforeReq }" [loading]="service.http.loading"

6
src/app/routes/sys-setting/components/role-management/role-management.component.ts
View File

@ -45,12 +45,14 @@ export class RoleManagementComponent implements OnInit {
{
text: '编辑',
click: item => this.roleAction(item),
iif: item => item.roleName !== '超级管理员'
iif: item => item.roleName !== '超级管理员',
acl: { ability: ['SYSTEM-ROLE-edit'] },
},
{
text: '删除',
click: item => this.deleteAction(item),
iif: item => item.roleName !== '超级管理员'
iif: item => item.roleName !== '超级管理员',
acl: { ability: ['SYSTEM-ROLE-delete'] },
}
]
}