admin/MaxKey
1
0
Fork 0
mirror of https://gitee.com/dromara/MaxKey.git synced 2025-12-07 01:18:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

增加删除确认提醒

Browse Source
This commit is contained in:
MaxKey 2024-07-31 16:59:29 +08:00
parent f706c2054b
commit 65d745a69b
35 changed files with 1215 additions and 684 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maxkey-web-frontend/maxkey-web-app/src/app/shared/consts.ts
View File

@ -26,5 +26,5 @@ export const CONSTS = {
REDIRECT_URI: 'redirect_uri',
REMEMBER: 'remember_me',
TOKEN: '_token',
VERSION: 'v4.1.0 GA'
VERSION: 'v4.1.1 GA'
};

135
maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/access/access.component.html
View File

@ -8,8 +8,14 @@
<nz-form-item>
<nz-form-label nzFor="groupName">{{ 'mxk.groups.name' | i18n }}</nz-form-label>
<nz-form-control>
<input nz-input [(ngModel)]="groupQuery.params.groupName" [ngModelOptions]="{ standalone: true }"
name="groupName" placeholder="" id="groupName" />
<input
nz-input
[(ngModel)]="groupQuery.params.groupName"
[ngModelOptions]="{ standalone: true }"
name="groupName"
placeholder=""
id="groupName"
/>
</nz-form-control>
</nz-form-item>
</div>
@ -20,11 +26,21 @@
</div>
</form>
</nz-card>
<nz-table #dynamicTable nzTableLayout="auto" nzSize="small" nzBordered nzShowSizeChanger
[nzData]="groupQuery.results.rows" [nzFrontPagination]="false" [nzTotal]="groupQuery.results.records"
[nzPageSizeOptions]="groupQuery.params.pageSizeOptions" [nzPageSize]="groupQuery.params.pageSize"
[nzPageIndex]="groupQuery.params.pageNumber" [nzLoading]="this.groupQuery.tableLoading"
(nzQueryParams)="onGroupQueryParamsChange($event)">
<nz-table
#dynamicTable
nzTableLayout="auto"
nzSize="small"
nzBordered
nzShowSizeChanger
[nzData]="groupQuery.results.rows"
[nzFrontPagination]="false"
[nzTotal]="groupQuery.results.records"
[nzPageSizeOptions]="groupQuery.params.pageSizeOptions"
[nzPageSize]="groupQuery.params.pageSize"
[nzPageIndex]="groupQuery.params.pageNumber"
[nzLoading]="this.groupQuery.tableLoading"
(nzQueryParams)="onGroupQueryParamsChange($event)"
>
<thead>
<tr>
<th></th>
@ -35,8 +51,11 @@
</thead>
<tbody>
<tr *ngFor="let data of groupQuery.results.rows">
<td [nzChecked]="groupQuery.tableCheckedId.has(data.id)" [nzDisabled]="data.disabled"
(nzCheckedChange)="onGroupTableItemChecked(data.id, data.groupName, $event)"></td>
<td
[nzChecked]="groupQuery.tableCheckedId.has(data.id)"
[nzDisabled]="data.disabled"
(nzCheckedChange)="onGroupTableItemChecked(data.id, data.groupName, $event)"
></td>
<td nzAlign="left" style="display: none">
<span>{{ data.id }}</span>
</td>
@ -55,26 +74,37 @@
<div nz-col nzMd="10" nzSm="24">
<nz-form-item>
<nz-form-label nzFor="roleName">{{ 'mxk.roles.name' | i18n }}</nz-form-label>
<input nz-input [(ngModel)]="query.params.groupName" [ngModelOptions]="{ standalone: true }" readonly
placeholder="" disabled />
<input
nz-input
[(ngModel)]="query.params.groupName"
[ngModelOptions]="{ standalone: true }"
readonly
placeholder=""
disabled
/>
</nz-form-item>
</div>
<div nz-col nzMd="10" nzSm="24">
<nz-form-item>
<nz-form-label nzFor="name">{{ 'mxk.apps.name' | i18n }}</nz-form-label>
<nz-form-control>
<input nz-input [(ngModel)]="query.params.appName" [ngModelOptions]="{ standalone: true }"
name="appName" placeholder="" id="appName" />
<input
nz-input
[(ngModel)]="query.params.appName"
[ngModelOptions]="{ standalone: true }"
name="appName"
placeholder=""
id="appName"
/>
</nz-form-control>
</nz-form-item>
</div>
<div nz-col [nzSpan]="query.expandForm ? 24 : 4" [class.text-right]="query.expandForm">
<button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query'
| i18n }}</button>
<button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset'
| i18n }}</button>
<button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' | i18n }}</button>
<button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' | i18n }}</button>
<button nz-button (click)="query.expandForm = !query.expandForm" class="mx-sm" style="display: none">
{{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button>
{{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button
>
</div>
</div>
</form>
@ -82,24 +112,46 @@
<nz-card [nzBordered]="false">
<div nz-row [nzGutter]="{ xs: 8, sm: 8, md: 8, lg: 24, xl: 48, xxl: 48 }">
<div nz-col [nzSpan]="24" class="table-list-toolbar">
<button nz-button type="button" [nzType]="'primary'" (click)="onAdd($event)">{{ 'mxk.text.add' | i18n
}}</button>
<button nz-button type="button" (click)="onBatchDelete($event)" [nzType]="'primary'" nzDanger
class="mx-sm">{{
'mxk.text.delete' | i18n
}}</button>
<button nz-button type="button" [nzType]="'primary'" (click)="onAdd($event)">{{ 'mxk.text.add' | i18n }}</button>
<button
nz-button
type="button"
nz-popconfirm
nzPopconfirmTitle="{{ 'mxk.text.delete.popconfirm.title' | i18n }}"
nzPopconfirmPlacement="left"
[nzCancelText]="'mxk.text.delete.popconfirm.cancelText' | i18n"
[nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n"
(nzOnConfirm)="onBatchDelete()"
[nzType]="'primary'"
nzDanger
class="mx-sm"
>{{ 'mxk.text.delete' | i18n }}</button
>
</div>
<div nz-col nzMd="24" nzSm="24">
<nz-table #dynamicTable nzTableLayout="auto" nzSize="small" nzBordered nzShowSizeChanger
[nzData]="query.results.rows" [nzFrontPagination]="false" [nzTotal]="query.results.records"
[nzPageSizeOptions]="query.params.pageSizeOptions" [nzPageSize]="query.params.pageSize"
[nzPageIndex]="query.params.pageNumber" [nzLoading]="this.query.tableLoading"
(nzQueryParams)="onQueryParamsChange($event)">
<nz-table
#dynamicTable
nzTableLayout="auto"
nzSize="small"
nzBordered
nzShowSizeChanger
[nzData]="query.results.rows"
[nzFrontPagination]="false"
[nzTotal]="query.results.records"
[nzPageSizeOptions]="query.params.pageSizeOptions"
[nzPageSize]="query.params.pageSize"
[nzPageIndex]="query.params.pageNumber"
[nzLoading]="this.query.tableLoading"
(nzQueryParams)="onQueryParamsChange($event)"
>
<thead>
<tr>
<th [nzChecked]="query.checked" [nzIndeterminate]="query.indeterminate"
(nzCheckedChange)="onTableAllChecked($event)"></th>
<th
[nzChecked]="query.checked"
[nzIndeterminate]="query.indeterminate"
(nzCheckedChange)="onTableAllChecked($event)"
></th>
<th nzAlign="center" style="display: none">Id</th>
<th nzAlign="center">{{ 'mxk.roles.name' | i18n }}</th>
<th nzAlign="center">{{ 'mxk.apps.icon' | i18n }}</th>
@ -110,8 +162,11 @@
</thead>
<tbody>
<tr *ngFor="let data of query.results.rows">
<td [nzChecked]="query.tableCheckedId.has(data.id)" [nzDisabled]="data.disabled"
(nzCheckedChange)="onTableItemChecked(data.id, $event)"></td>
<td
[nzChecked]="query.tableCheckedId.has(data.id)"
[nzDisabled]="data.disabled"
(nzCheckedChange)="onTableItemChecked(data.id, $event)"
></td>
<td nzAlign="left"> {{ data.groupName }}</td>
<td nzAlign="center"><img height="30" border="0px" src="{{ data.iconBase64 }}" /></td>
<td nzAlign="left"> {{ data.appName }}</td>
@ -147,8 +202,18 @@
</td>
<td nzAlign="center" nzBreakWord="false">
<div nz-col>
<button nz-button type="button" (click)="onDelete($event, data.id)" nzDanger>{{ 'mxk.text.delete'
| i18n }}</button>
<button
nz-button
type="button"
nz-popconfirm
nzPopconfirmTitle="{{ 'mxk.text.delete.popconfirm.title' | i18n }}"
nzPopconfirmPlacement="left"
[nzCancelText]="'mxk.text.delete.popconfirm.cancelText' | i18n"
[nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n"
(nzOnConfirm)="onDelete(data.id)"
nzDanger
>{{ 'mxk.text.delete' | i18n }}</button
>
</div>
</td>
</tr>

10
maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/access/access.component.ts
View File

@ -106,7 +106,7 @@ export class AccessComponent implements OnInit {
private route: ActivatedRoute,
private cdr: ChangeDetectorRef,
private http: _HttpClient
) { }
) {}
ngOnInit(): void {
if (this.route.snapshot.queryParams['groupId']) {
@ -128,10 +128,9 @@ export class AccessComponent implements OnInit {
this.fetch();
}
onReset(): void { }
onReset(): void {}
onBatchDelete(e: MouseEvent): void {
e.preventDefault();
onBatchDelete(): void {
this.accessService.delete(set2String(this.query.tableCheckedId)).subscribe(res => {
if (res.code == 0) {
this.msg.success(this.i18n.fanyi('mxk.alert.delete.success'));
@ -185,8 +184,7 @@ export class AccessComponent implements OnInit {
});
}
onDelete(e: MouseEvent, deleteId: String): void {
e.preventDefault();
onDelete(deleteId: String): void {
this.accessService.delete(deleteId).subscribe(res => {
if (res.code == 0) {
this.msg.success(this.i18n.fanyi('mxk.alert.delete.success'));

90
maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/accounts/accounts.component.html
View File

@ -8,12 +8,18 @@
<nz-form-label nzFor="appName">{{ 'mxk.accounts.appName' | i18n }}</nz-form-label>
<nz-form-control>
<nz-input-group nzSearch [nzAddOnAfter]="suffixButton">
<input nz-input [(ngModel)]="query.params.appName" [ngModelOptions]="{ standalone: true }" name="appName"
readonly placeholder="" id="appName" />
<input
nz-input
[(ngModel)]="query.params.appName"
[ngModelOptions]="{ standalone: true }"
name="appName"
readonly
placeholder=""
id="appName"
/>
</nz-input-group>
<ng-template #suffixButton>
<button nz-button nzType="primary" (click)="onSelect($event)" nzSearch>{{ 'mxk.text.select' | i18n
}}</button>
<button nz-button nzType="primary" (click)="onSelect($event)" nzSearch>{{ 'mxk.text.select' | i18n }}</button>
</ng-template>
</nz-form-control>
</nz-form-item>
@ -22,18 +28,24 @@
<nz-form-item>
<nz-form-label nzFor="name">{{ 'mxk.accounts.username' | i18n }}</nz-form-label>
<nz-form-control>
<input nz-input [(ngModel)]="query.params.username" [ngModelOptions]="{ standalone: true }" name="username"
placeholder="" id="username" />
<input
nz-input
[(ngModel)]="query.params.username"
[ngModelOptions]="{ standalone: true }"
name="username"
placeholder=""
id="username"
/>
</nz-form-control>
</nz-form-item>
</div>
<div nz-col [nzSpan]="query.expandForm ? 24 : 8" [class.text-right]="query.expandForm">
<button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' |
i18n }}</button>
<button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' | i18n }}</button>
<button nz-button type="reset" (click)="onReset()" class="mx-sm">{{ 'mxk.text.reset' | i18n }}</button>
<button nz-button (click)="query.expandForm = !query.expandForm" class="mx-sm" style="display: none">
{{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button>
{{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button
>
</div>
</div>
</form>
@ -41,18 +53,39 @@
<nz-card>
<div nz-col [nzSpan]="24" class="table-list-toolbar">
<button nz-button type="button" [nzType]="'primary'" (click)="onAdd($event)">{{ 'mxk.text.add' | i18n }}</button>
<button nz-button type="button" (click)="onBatchDelete($event)" [nzType]="'primary'" nzDanger class="mx-sm">{{
'mxk.text.delete' | i18n
}}</button>
<button
nz-button
type="button"
nz-popconfirm
nzPopconfirmTitle="{{ 'mxk.text.delete.popconfirm.title' | i18n }}"
nzPopconfirmPlacement="left"
[nzCancelText]="'mxk.text.delete.popconfirm.cancelText' | i18n"
[nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n"
(nzOnConfirm)="onBatchDelete()"
[nzType]="'primary'"
nzDanger
class="mx-sm"
>{{ 'mxk.text.delete' | i18n }}</button
>
</div>
<nz-table #dynamicTable nzTableLayout="auto" nzSize="small" nzBordered nzShowSizeChanger [nzData]="query.results.rows"
[nzFrontPagination]="false" [nzTotal]="query.results.records" [nzPageSizeOptions]="query.params.pageSizeOptions"
[nzPageSize]="query.params.pageSize" [nzPageIndex]="query.params.pageNumber" [nzLoading]="this.query.tableLoading"
(nzQueryParams)="onQueryParamsChange($event)">
<nz-table
#dynamicTable
nzTableLayout="auto"
nzSize="small"
nzBordered
nzShowSizeChanger
[nzData]="query.results.rows"
[nzFrontPagination]="false"
[nzTotal]="query.results.records"
[nzPageSizeOptions]="query.params.pageSizeOptions"
[nzPageSize]="query.params.pageSize"
[nzPageIndex]="query.params.pageNumber"
[nzLoading]="this.query.tableLoading"
(nzQueryParams)="onQueryParamsChange($event)"
>
<thead>
<tr>
<th [nzChecked]="query.checked" [nzIndeterminate]="query.indeterminate"
(nzCheckedChange)="onTableAllChecked($event)"></th>
<th [nzChecked]="query.checked" [nzIndeterminate]="query.indeterminate" (nzCheckedChange)="onTableAllChecked($event)"></th>
<th nzAlign="center" style="display: none">Id</th>
<th nzAlign="center">{{ 'mxk.accounts.username' | i18n }}</th>
<th nzAlign="center">{{ 'mxk.accounts.displayName' | i18n }}</th>
@ -63,8 +96,11 @@
</thead>
<tbody>
<tr *ngFor="let data of query.results.rows">
<td [nzChecked]="query.tableCheckedId.has(data.id)" [nzDisabled]="data.disabled"
(nzCheckedChange)="onTableItemChecked(data.id, $event)"></td>
<td
[nzChecked]="query.tableCheckedId.has(data.id)"
[nzDisabled]="data.disabled"
(nzCheckedChange)="onTableItemChecked(data.id, $event)"
></td>
<td nzAlign="left" style="display: none">
<span>{{ data.id }}</span>
</td>
@ -75,8 +111,18 @@
<td nzAlign="center" nzBreakWord="false">
<div nz-col>
<button nz-button type="button" (click)="onDelete($event, data.id)" nzDanger>{{ 'mxk.text.delete' | i18n
}}</button>
<button
nz-button
type="button"
nz-popconfirm
nzPopconfirmTitle="{{ 'mxk.text.delete.popconfirm.title' | i18n }}"
nzPopconfirmPlacement="left"
[nzCancelText]="'mxk.text.delete.popconfirm.cancelText' | i18n"
[nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n"
(nzOnConfirm)="onDelete(data.id)"
nzDanger
>{{ 'mxk.text.delete' | i18n }}</button
>
</div>
</td>
</tr>

6
maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/accounts/accounts.component.ts
View File

@ -147,8 +147,7 @@ export class AccountsComponent implements OnInit {
}
});
}
onBatchDelete(e: MouseEvent): void {
e.preventDefault();
onBatchDelete(): void {
this.accountsService.delete(set2String(this.query.tableCheckedId)).subscribe(res => {
if (res.code == 0) {
this.msg.success(this.i18n.fanyi('mxk.alert.delete.success'));
@ -180,8 +179,7 @@ export class AccountsComponent implements OnInit {
});
}
onDelete(e: MouseEvent, deleteId: String): void {
e.preventDefault();
onDelete(deleteId: String): void {
this.accountsService.delete(deleteId).subscribe(res => {
if (res.code == 0) {
this.msg.success(this.i18n.fanyi('mxk.alert.delete.success'));

17
maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/apps.component.html
View File

@ -56,9 +56,20 @@
'mxk.text.add' | i18n
}}</button>
<button nz-button type="button" (click)="onBatchDelete($event)" [nzType]="'primary'" nzDanger class="mx-sm">{{
'mxk.text.delete' | i18n
}}</button>
<button
nz-button
type="button"
nz-popconfirm
nzPopconfirmTitle="{{ 'mxk.text.delete.popconfirm.title' | i18n }}"
nzPopconfirmPlacement="left"
[nzCancelText]="'mxk.text.delete.popconfirm.cancelText' | i18n"
[nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n"
(nzOnConfirm)="onBatchDelete()"
[nzType]="'primary'"
nzDanger
class="mx-sm"
>{{ 'mxk.text.delete' | i18n }}</button
>
</div>
<nz-table
#dynamicTable

3
maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/apps.component.ts
View File

@ -118,8 +118,7 @@ export class AppsComponent implements OnInit {
onReset(): void {}
onBatchDelete(e: MouseEvent): void {
e.preventDefault();
onBatchDelete(): void {
this.appsService.delete(set2String(this.query.tableCheckedId)).subscribe(res => {
if (res.code == 0) {
this.msg.success(this.i18n.fanyi('mxk.alert.delete.success'));

30
maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/accounts-strategy/accounts-strategy.component.html
View File

@ -25,9 +25,20 @@
<nz-card>
<div nz-col [nzSpan]="24" class="table-list-toolbar">
<button nz-button type="button" [nzType]="'primary'" (click)="onAdd($event)">{{ 'mxk.text.add' | i18n }}</button>
<button nz-button type="button" (click)="onBatchDelete($event)" [nzType]="'primary'" nzDanger class="mx-sm">{{
'mxk.text.delete' | i18n
}}</button>
<button
nz-button
type="button"
nz-popconfirm
nzPopconfirmTitle="{{ 'mxk.text.delete.popconfirm.title' | i18n }}"
nzPopconfirmPlacement="left"
[nzCancelText]="'mxk.text.delete.popconfirm.cancelText' | i18n"
[nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n"
(nzOnConfirm)="onBatchDelete()"
[nzType]="'primary'"
nzDanger
class="mx-sm"
>{{ 'mxk.text.delete' | i18n }}</button
>
</div>
<nz-table
#dynamicTable
@ -77,7 +88,18 @@
<td nzAlign="left" nzBreakWord="false">
<div nz-col>
<button nz-button type="button" (click)="onEdit($event, data.id)" style="float: left">{{ 'mxk.text.edit' | i18n }}</button>
<button nz-button type="button" (click)="onDelete($event, data.id)" nzDanger>{{ 'mxk.text.delete' | i18n }}</button>
<button
nz-button
type="button"
nz-popconfirm
nzPopconfirmTitle="{{ 'mxk.text.delete.popconfirm.title' | i18n }}"
nzPopconfirmPlacement="left"
[nzCancelText]="'mxk.text.delete.popconfirm.cancelText' | i18n"
[nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n"
(nzOnConfirm)="onDelete(data.id)"
nzDanger
>{{ 'mxk.text.delete' | i18n }}</button
>
</div>
</td>
</tr>

6
maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/accounts-strategy/accounts-strategy.component.ts
View File

@ -108,8 +108,7 @@ export class AccountsStrategyComponent implements OnInit {
onReset(): void {}
onBatchDelete(e: MouseEvent): void {
e.preventDefault();
onBatchDelete(): void {
this.accountsStrategyService.delete(set2String(this.query.tableCheckedId)).subscribe(res => {
if (res.code == 0) {
this.msg.success(this.i18n.fanyi('mxk.alert.delete.success'));
@ -160,8 +159,7 @@ export class AccountsStrategyComponent implements OnInit {
});
}
onDelete(e: MouseEvent, deleteId: String): void {
e.preventDefault();
onDelete(deleteId: String): void {
this.accountsStrategyService.delete(deleteId).subscribe(res => {
if (res.code == 0) {
this.msg.success(this.i18n.fanyi('mxk.alert.delete.success'));

30
maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/adapters/adapters.component.html
View File

@ -25,9 +25,20 @@
<nz-card>
<div nz-col [nzSpan]="24" class="table-list-toolbar">
<button nz-button type="button" [nzType]="'primary'" (click)="onAdd($event)">{{ 'mxk.text.add' | i18n }}</button>
<button nz-button type="button" (click)="onBatchDelete($event)" [nzType]="'primary'" nzDanger class="mx-sm">{{
'mxk.text.delete' | i18n
}}</button>
<button
nz-button
type="button"
nz-popconfirm
nzPopconfirmTitle="{{ 'mxk.text.delete.popconfirm.title' | i18n }}"
nzPopconfirmPlacement="left"
[nzCancelText]="'mxk.text.delete.popconfirm.cancelText' | i18n"
[nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n"
(nzOnConfirm)="onBatchDelete()"
[nzType]="'primary'"
nzDanger
class="mx-sm"
>{{ 'mxk.text.delete' | i18n }}</button
>
</div>
<nz-table
#dynamicTable
@ -75,7 +86,18 @@
<td nzAlign="left" nzBreakWord="false">
<div nz-col>
<button nz-button type="button" (click)="onEdit($event, data.id)" style="float: left">{{ 'mxk.text.edit' | i18n }}</button>
<button nz-button type="button" (click)="onDelete($event, data.id)" nzDanger>{{ 'mxk.text.delete' | i18n }}</button>
<button
nz-button
type="button"
nz-popconfirm
nzPopconfirmTitle="{{ 'mxk.text.delete.popconfirm.title' | i18n }}"
nzPopconfirmPlacement="left"
[nzCancelText]="'mxk.text.delete.popconfirm.cancelText' | i18n"
[nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n"
(nzOnConfirm)="onDelete(data.id)"
nzDanger
>{{ 'mxk.text.delete' | i18n }}</button
>
</div>
</td>
</tr>

6
maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/adapters/adapters.component.ts
View File

@ -108,8 +108,7 @@ export class AdaptersComponent implements OnInit {
onReset(): void {}
onBatchDelete(e: MouseEvent): void {
e.preventDefault();
onBatchDelete(): void {
this.adaptersService.delete(set2String(this.query.tableCheckedId)).subscribe(res => {
if (res.code == 0) {
this.msg.success(this.i18n.fanyi('mxk.alert.delete.success'));
@ -162,8 +161,7 @@ export class AdaptersComponent implements OnInit {
});
}
onDelete(e: MouseEvent, deleteId: String): void {
e.preventDefault();
onDelete(deleteId: String): void {
this.adaptersService.delete(deleteId).subscribe(res => {
if (res.code == 0) {
this.msg.success(this.i18n.fanyi('mxk.alert.delete.success'));

90
maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/connectors/connectors.component.html
View File

@ -7,40 +7,65 @@
<nz-form-item>
<nz-form-label nzFor="connName">{{ 'mxk.connectors.connName' | i18n }}</nz-form-label>
<nz-form-control>
<input nz-input [(ngModel)]="query.params.connName" [ngModelOptions]="{ standalone: true }"
name="connName" placeholder="" id="connName" />
<input
nz-input
[(ngModel)]="query.params.connName"
[ngModelOptions]="{ standalone: true }"
name="connName"
placeholder=""
id="connName"
/>
</nz-form-control>
</nz-form-item>
</div>
<div nz-col [nzSpan]="query.expandForm ? 24 : 8" [class.text-right]="query.expandForm">
<button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{
'mxk.text.query' | i18n }}</button>
<button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{
'mxk.text.reset' | i18n }}</button>
<button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' | i18n }}</button>
<button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' | i18n }}</button>
<button nz-button (click)="query.expandForm = !query.expandForm" class="mx-sm" style="display: none">
{{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button>
{{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button
>
</div>
</div>
</form>
</nz-card>
<nz-card>
<div nz-col [nzSpan]="24" class="table-list-toolbar">
<button nz-button type="button" [nzType]="'primary'" (click)="onAdd($event)">{{ 'mxk.text.add' | i18n
}}</button>
<button nz-button type="button" (click)="onBatchDelete($event)" [nzType]="'primary'" nzDanger class="mx-sm">{{
'mxk.text.delete' | i18n
}}</button>
<button nz-button type="button" [nzType]="'primary'" (click)="onAdd($event)">{{ 'mxk.text.add' | i18n }}</button>
<button
nz-button
type="button"
nz-popconfirm
nzPopconfirmTitle="{{ 'mxk.text.delete.popconfirm.title' | i18n }}"
nzPopconfirmPlacement="left"
[nzCancelText]="'mxk.text.delete.popconfirm.cancelText' | i18n"
[nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n"
(nzOnConfirm)="onBatchDelete()"
[nzType]="'primary'"
nzDanger
class="mx-sm"
>{{ 'mxk.text.delete' | i18n }}</button
>
</div>
<nz-table #dynamicTable nzTableLayout="auto" nzSize="small" nzBordered nzShowSizeChanger
[nzData]="query.results.rows" [nzFrontPagination]="false" [nzTotal]="query.results.records"
[nzPageSizeOptions]="query.params.pageSizeOptions" [nzPageSize]="query.params.pageSize"
[nzPageIndex]="query.params.pageNumber" [nzLoading]="this.query.tableLoading"
(nzQueryParams)="onQueryParamsChange($event)" nzWidth="100%">
<nz-table
#dynamicTable
nzTableLayout="auto"
nzSize="small"
nzBordered
nzShowSizeChanger
[nzData]="query.results.rows"
[nzFrontPagination]="false"
[nzTotal]="query.results.records"
[nzPageSizeOptions]="query.params.pageSizeOptions"
[nzPageSize]="query.params.pageSize"
[nzPageIndex]="query.params.pageNumber"
[nzLoading]="this.query.tableLoading"
(nzQueryParams)="onQueryParamsChange($event)"
nzWidth="100%"
>
<thead>
<tr>
<th [nzChecked]="query.checked" [nzIndeterminate]="query.indeterminate"
(nzCheckedChange)="onTableAllChecked($event)"></th>
<th [nzChecked]="query.checked" [nzIndeterminate]="query.indeterminate" (nzCheckedChange)="onTableAllChecked($event)"></th>
<th nzAlign="center" style="display: none">Id</th>
<th nzAlign="center">{{ 'mxk.connectors.connName' | i18n }}</th>
<th nzAlign="center">{{ 'mxk.connectors.justInTime' | i18n }}</th>
@ -50,8 +75,11 @@
</thead>
<tbody>
<tr *ngFor="let data of query.results.rows">
<td [nzChecked]="query.tableCheckedId.has(data.id)" [nzDisabled]="data.disabled"
(nzCheckedChange)="onTableItemChecked(data.id, $event)"></td>
<td
[nzChecked]="query.tableCheckedId.has(data.id)"
[nzDisabled]="data.disabled"
(nzCheckedChange)="onTableItemChecked(data.id, $event)"
></td>
<td nzAlign="left" style="display: none">
<span>{{ data.id }}</span>
</td>
@ -59,14 +87,22 @@
<td nzAlign="left"> {{ data.connName }}</td>
<td nzAlign="center" *ngIf="data.justInTime == 1">{{ 'mxk.text.yes' | i18n }}</td>
<td nzAlign="center" *ngIf="data.justInTime == 0">{{ 'mxk.text.no' | i18n }}</td>
<td nzAlign="center"> <i *ngIf="data.status == 1" nz-icon nzType="check-circle" nzTheme="fill"
style="color: green"></i></td>
<td nzAlign="center"> <i *ngIf="data.status == 1" nz-icon nzType="check-circle" nzTheme="fill" style="color: green"></i></td>
<td nzAlign="center" nzBreakWord="false">
<div nz-col>
<button nz-button type="button" (click)="onEdit($event, data.id)">{{
'mxk.text.edit' | i18n }}</button>
<button nz-button type="button" (click)="onDelete($event, data.id)" nzDanger>{{
'mxk.text.delete' | i18n }}</button>
<button nz-button type="button" (click)="onEdit($event, data.id)">{{ 'mxk.text.edit' | i18n }}</button>
<button
nz-button
type="button"
nz-popconfirm
nzPopconfirmTitle="{{ 'mxk.text.delete.popconfirm.title' | i18n }}"
nzPopconfirmPlacement="left"
[nzCancelText]="'mxk.text.delete.popconfirm.cancelText' | i18n"
[nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n"
(nzOnConfirm)="onDelete(data.id)"
nzDanger
>{{ 'mxk.text.delete' | i18n }}</button
>
</div>
</td>
</tr>

7
maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/connectors/connectors.component.ts
View File

@ -14,7 +14,6 @@
* limitations under the License.
*/
import { ChangeDetectionStrategy, ViewContainerRef, ChangeDetectorRef, Component, OnInit, Inject } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { I18NService } from '@core';
@ -109,8 +108,7 @@ export class ConnectorsComponent implements OnInit {
onReset(): void {}
onBatchDelete(e: MouseEvent): void {
e.preventDefault();
onBatchDelete(): void {
this.connectorsService.delete(set2String(this.query.tableCheckedId)).subscribe(res => {
if (res.code == 0) {
this.msg.success(this.i18n.fanyi('mxk.alert.delete.success'));
@ -160,8 +158,7 @@ export class ConnectorsComponent implements OnInit {
});
}
onDelete(e: MouseEvent, deleteId: String): void {
e.preventDefault();
onDelete(deleteId: String): void {
this.connectorsService.delete(deleteId).subscribe(res => {
if (res.code == 0) {
this.msg.success(this.i18n.fanyi('mxk.alert.delete.success'));

92
maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/socials-provider/socials-provider.component.html
View File

@ -7,19 +7,24 @@
<nz-form-item>
<nz-form-label nzFor="name">{{ 'mxk.socialsproviders.providerName' | i18n }}</nz-form-label>
<nz-form-control>
<input nz-input [(ngModel)]="query.params.providerName" [ngModelOptions]="{ standalone: true }"
name="providerName" placeholder="" id="providerName" />
<input
nz-input
[(ngModel)]="query.params.providerName"
[ngModelOptions]="{ standalone: true }"
name="providerName"
placeholder=""
id="providerName"
/>
</nz-form-control>
</nz-form-item>
</div>
<div nz-col [nzSpan]="query.expandForm ? 24 : 8" [class.text-right]="query.expandForm">
<button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' |
i18n }}</button>
<button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' |
i18n }}</button>
<button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' | i18n }}</button>
<button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' | i18n }}</button>
<button nz-button (click)="query.expandForm = !query.expandForm" class="mx-sm" style="display: none">
{{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button>
{{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button
>
</div>
</div>
</form>
@ -27,18 +32,40 @@
<nz-card>
<div nz-col [nzSpan]="24" class="table-list-toolbar">
<button nz-button type="button" [nzType]="'primary'" (click)="onAdd($event)">{{ 'mxk.text.add' | i18n }}</button>
<button nz-button type="button" (click)="onBatchDelete($event)" [nzType]="'primary'" nzDanger class="mx-sm">{{
'mxk.text.delete' | i18n
}}</button>
<button
nz-button
type="button"
nz-popconfirm
nzPopconfirmTitle="{{ 'mxk.text.delete.popconfirm.title' | i18n }}"
nzPopconfirmPlacement="left"
[nzCancelText]="'mxk.text.delete.popconfirm.cancelText' | i18n"
[nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n"
(nzOnConfirm)="onBatchDelete()"
[nzType]="'primary'"
nzDanger
class="mx-sm"
>{{ 'mxk.text.delete' | i18n }}</button
>
</div>
<nz-table #dynamicTable nzTableLayout="auto" nzSize="small" nzBordered nzShowSizeChanger [nzData]="query.results.rows"
[nzFrontPagination]="false" [nzTotal]="query.results.records" [nzPageSizeOptions]="query.params.pageSizeOptions"
[nzPageSize]="query.params.pageSize" [nzPageIndex]="query.params.pageNumber" [nzLoading]="this.query.tableLoading"
(nzQueryParams)="onQueryParamsChange($event)" nzWidth="100%">
<nz-table
#dynamicTable
nzTableLayout="auto"
nzSize="small"
nzBordered
nzShowSizeChanger
[nzData]="query.results.rows"
[nzFrontPagination]="false"
[nzTotal]="query.results.records"
[nzPageSizeOptions]="query.params.pageSizeOptions"
[nzPageSize]="query.params.pageSize"
[nzPageIndex]="query.params.pageNumber"
[nzLoading]="this.query.tableLoading"
(nzQueryParams)="onQueryParamsChange($event)"
nzWidth="100%"
>
<thead>
<tr>
<th [nzChecked]="query.checked" [nzIndeterminate]="query.indeterminate"
(nzCheckedChange)="onTableAllChecked($event)"></th>
<th [nzChecked]="query.checked" [nzIndeterminate]="query.indeterminate" (nzCheckedChange)="onTableAllChecked($event)"></th>
<th nzAlign="center" style="display: none">Id</th>
<th nzAlign="center">{{ 'mxk.socialsproviders.icon' | i18n }}</th>
<th nzAlign="center">{{ 'mxk.socialsproviders.provider' | i18n }}</th>
@ -53,8 +80,11 @@
</thead>
<tbody>
<tr *ngFor="let data of query.results.rows">
<td [nzChecked]="query.tableCheckedId.has(data.id)" [nzDisabled]="data.disabled"
(nzCheckedChange)="onTableItemChecked(data.id, $event)"></td>
<td
[nzChecked]="query.tableCheckedId.has(data.id)"
[nzDisabled]="data.disabled"
(nzCheckedChange)="onTableItemChecked(data.id, $event)"
></td>
<td nzAlign="left" style="display: none">
<span>{{ data.id }}</span>
</td>
@ -62,19 +92,25 @@
<td nzAlign="left"> {{ data.provider }}</td>
<td nzAlign="left"> {{ data.providerName }}</td>
<td nzAlign="center"> {{ data.sortIndex }}</td>
<td nzAlign="center"> <i *ngIf="data.display == 'true'" nz-icon nzType="check-circle" nzTheme="fill"
style="color: green"></i></td>
<td nzAlign="center"> <i *ngIf="data.scanCode == 'true'" nz-icon nzType="check-circle" nzTheme="fill"
style="color: green"></i></td>
<td nzAlign="center"> <i *ngIf="data.display == 'true'" nz-icon nzType="check-circle" nzTheme="fill" style="color: green"></i></td>
<td nzAlign="center"> <i *ngIf="data.scanCode == 'true'" nz-icon nzType="check-circle" nzTheme="fill" style="color: green"></i></td>
<td nzAlign="center"> <i *ngIf="data.status == 1" nz-icon nzType="check-circle" nzTheme="fill"
style="color: green"></i></td>
<td nzAlign="center"> <i *ngIf="data.status == 1" nz-icon nzType="check-circle" nzTheme="fill" style="color: green"></i></td>
<td nzAlign="center" nzBreakWord="false">
<div nz-col>
<button nz-button type="button" (click)="onEdit($event, data.id)">{{ 'mxk.text.edit' |
i18n }}</button>
<button nz-button type="button" (click)="onDelete($event, data.id)" nzDanger>{{ 'mxk.text.delete' | i18n
}}</button>
<button nz-button type="button" (click)="onEdit($event, data.id)">{{ 'mxk.text.edit' | i18n }}</button>
<button
nz-button
type="button"
nz-popconfirm
nzPopconfirmTitle="{{ 'mxk.text.delete.popconfirm.title' | i18n }}"
nzPopconfirmPlacement="left"
[nzCancelText]="'mxk.text.delete.popconfirm.cancelText' | i18n"
[nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n"
(nzOnConfirm)="onDelete(data.id)"
nzDanger
>{{ 'mxk.text.delete' | i18n }}</button
>
</div>
</td>
</tr>

6
maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/socials-provider/socials-provider.component.ts
View File

@ -107,8 +107,7 @@ export class SocialsProviderComponent implements OnInit {
onReset(): void {}
onBatchDelete(e: MouseEvent): void {
e.preventDefault();
onBatchDelete(): void {
this.socialsProviderService.delete(set2String(this.query.tableCheckedId)).subscribe(res => {
if (res.code == 0) {
this.msg.success(this.i18n.fanyi('mxk.alert.delete.success'));
@ -159,8 +158,7 @@ export class SocialsProviderComponent implements OnInit {
});
}
onDelete(e: MouseEvent, deleteId: String): void {
e.preventDefault();
onDelete(deleteId: String): void {
this.socialsProviderService.delete(deleteId).subscribe(res => {
if (res.code == 0) {
this.msg.success(this.i18n.fanyi('mxk.alert.delete.success'));

82
maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/synchronizers/synchronizers.component.html
View File

@ -7,19 +7,17 @@
<nz-form-item>
<nz-form-label nzFor="name">{{ 'mxk.synchronizers.name' | i18n }}</nz-form-label>
<nz-form-control>
<input nz-input [(ngModel)]="query.params.name" [ngModelOptions]="{ standalone: true }" name="name"
placeholder="" id="name" />
<input nz-input [(ngModel)]="query.params.name" [ngModelOptions]="{ standalone: true }" name="name" placeholder="" id="name" />
</nz-form-control>
</nz-form-item>
</div>
<div nz-col [nzSpan]="query.expandForm ? 24 : 8" [class.text-right]="query.expandForm">
<button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' |
i18n }}</button>
<button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' |
i18n }}</button>
<button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' | i18n }}</button>
<button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' | i18n }}</button>
<button nz-button (click)="query.expandForm = !query.expandForm" class="mx-sm" style="display: none">
{{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button>
{{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button
>
</div>
</div>
</form>
@ -27,18 +25,40 @@
<nz-card>
<div nz-col [nzSpan]="24" class="table-list-toolbar">
<button nz-button type="button" [nzType]="'primary'" (click)="onAdd($event)">{{ 'mxk.text.add' | i18n }}</button>
<button nz-button type="button" (click)="onBatchDelete($event)" [nzType]="'primary'" nzDanger class="mx-sm">{{
'mxk.text.delete' | i18n
}}</button>
<button
nz-button
type="button"
nz-popconfirm
nzPopconfirmTitle="{{ 'mxk.text.delete.popconfirm.title' | i18n }}"
nzPopconfirmPlacement="left"
[nzCancelText]="'mxk.text.delete.popconfirm.cancelText' | i18n"
[nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n"
(nzOnConfirm)="onBatchDelete()"
[nzType]="'primary'"
nzDanger
class="mx-sm"
>{{ 'mxk.text.delete' | i18n }}</button
>
</div>
<nz-table #dynamicTable nzTableLayout="auto" nzSize="small" nzBordered nzShowSizeChanger [nzData]="query.results.rows"
[nzFrontPagination]="false" [nzTotal]="query.results.records" [nzPageSizeOptions]="query.params.pageSizeOptions"
[nzPageSize]="query.params.pageSize" [nzPageIndex]="query.params.pageNumber" [nzLoading]="this.query.tableLoading"
(nzQueryParams)="onQueryParamsChange($event)" nzWidth="100%">
<nz-table
#dynamicTable
nzTableLayout="auto"
nzSize="small"
nzBordered
nzShowSizeChanger
[nzData]="query.results.rows"
[nzFrontPagination]="false"
[nzTotal]="query.results.records"
[nzPageSizeOptions]="query.params.pageSizeOptions"
[nzPageSize]="query.params.pageSize"
[nzPageIndex]="query.params.pageNumber"
[nzLoading]="this.query.tableLoading"
(nzQueryParams)="onQueryParamsChange($event)"
nzWidth="100%"
>
<thead>
<tr>
<th [nzChecked]="query.checked" [nzIndeterminate]="query.indeterminate"
(nzCheckedChange)="onTableAllChecked($event)"></th>
<th [nzChecked]="query.checked" [nzIndeterminate]="query.indeterminate" (nzCheckedChange)="onTableAllChecked($event)"></th>
<th nzAlign="center" style="display: none">Id</th>
<th nzAlign="center">{{ 'mxk.synchronizers.name' | i18n }}</th>
<th nzAlign="center">{{ 'mxk.synchronizers.scheduler' | i18n }}</th>
@ -48,24 +68,34 @@
</thead>
<tbody>
<tr *ngFor="let data of query.results.rows">
<td [nzChecked]="query.tableCheckedId.has(data.id)" [nzDisabled]="data.disabled"
(nzCheckedChange)="onTableItemChecked(data.id, $event)"></td>
<td
[nzChecked]="query.tableCheckedId.has(data.id)"
[nzDisabled]="data.disabled"
(nzCheckedChange)="onTableItemChecked(data.id, $event)"
></td>
<td nzAlign="left" style="display: none">
<span>{{ data.id }}</span>
</td>
<td nzAlign="left"> {{ data.name }}</td>
<td nzAlign="left"> {{ data.scheduler }}</td>
<td nzAlign="center"> <i *ngIf="data.status == 1" nz-icon nzType="check-circle" nzTheme="fill"
style="color: green"></i></td>
<td nzAlign="center"> <i *ngIf="data.status == 1" nz-icon nzType="check-circle" nzTheme="fill" style="color: green"></i></td>
<td nzAlign="center" nzBreakWord="false">
<div nz-col>
<button nz-button type="button" (click)="onSynchr($event, data.id)">{{ 'mxk.text.synchr'
| i18n }}</button>
<button nz-button type="button" (click)="onEdit($event, data.id)">{{ 'mxk.text.edit' |
i18n }}</button>
<button nz-button type="button" (click)="onDelete($event, data.id)" nzDanger>{{ 'mxk.text.delete' | i18n
}}</button>
<button nz-button type="button" (click)="onSynchr($event, data.id)">{{ 'mxk.text.synchr' | i18n }}</button>
<button nz-button type="button" (click)="onEdit($event, data.id)">{{ 'mxk.text.edit' | i18n }}</button>
<button
nz-button
type="button"
nz-popconfirm
nzPopconfirmTitle="{{ 'mxk.text.delete.popconfirm.title' | i18n }}"
nzPopconfirmPlacement="left"
[nzCancelText]="'mxk.text.delete.popconfirm.cancelText' | i18n"
[nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n"
(nzOnConfirm)="onDelete(data.id)"
nzDanger
>{{ 'mxk.text.delete' | i18n }}</button
>
</div>
</td>
</tr>

6
maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/synchronizers/synchronizers.component.ts
View File

@ -107,8 +107,7 @@ export class SynchronizersComponent implements OnInit {
onReset(): void {}
onBatchDelete(e: MouseEvent): void {
e.preventDefault();
onBatchDelete(): void {
this.synchronizersService.delete(set2String(this.query.tableCheckedId)).subscribe(res => {
if (res.code == 0) {
this.msg.success(this.i18n.fanyi('mxk.alert.delete.success'));
@ -169,8 +168,7 @@ export class SynchronizersComponent implements OnInit {
});
}
onDelete(e: MouseEvent, deleteId: String): void {
e.preventDefault();
onDelete(deleteId: String): void {
this.synchronizersService.delete(deleteId).subscribe(res => {
if (res.code == 0) {
this.msg.success(this.i18n.fanyi('mxk.alert.delete.success'));

138
maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/group-members/group-members.component.html
View File

@ -8,8 +8,14 @@
<nz-form-item>
<nz-form-label nzFor="groupName">{{ 'mxk.groups.name' | i18n }}</nz-form-label>
<nz-form-control>
<input nz-input [(ngModel)]="groupQuery.params.groupName" [ngModelOptions]="{ standalone: true }"
name="groupName" placeholder="" id="groupName" />
<input
nz-input
[(ngModel)]="groupQuery.params.groupName"
[ngModelOptions]="{ standalone: true }"
name="groupName"
placeholder=""
id="groupName"
/>
</nz-form-control>
</nz-form-item>
</div>
@ -20,11 +26,21 @@
</div>
</form>
</nz-card>
<nz-table #dynamicTable nzTableLayout="auto" nzSize="small" nzBordered nzShowSizeChanger
[nzData]="groupQuery.results.rows" [nzFrontPagination]="false" [nzTotal]="groupQuery.results.records"
[nzPageSizeOptions]="groupQuery.params.pageSizeOptions" [nzPageSize]="groupQuery.params.pageSize"
[nzPageIndex]="groupQuery.params.pageNumber" [nzLoading]="this.groupQuery.tableLoading"
(nzQueryParams)="onGroupQueryParamsChange($event)">
<nz-table
#dynamicTable
nzTableLayout="auto"
nzSize="small"
nzBordered
nzShowSizeChanger
[nzData]="groupQuery.results.rows"
[nzFrontPagination]="false"
[nzTotal]="groupQuery.results.records"
[nzPageSizeOptions]="groupQuery.params.pageSizeOptions"
[nzPageSize]="groupQuery.params.pageSize"
[nzPageIndex]="groupQuery.params.pageNumber"
[nzLoading]="this.groupQuery.tableLoading"
(nzQueryParams)="onGroupQueryParamsChange($event)"
>
<thead>
<tr>
<th></th>
@ -35,8 +51,11 @@
</thead>
<tbody>
<tr *ngFor="let data of groupQuery.results.rows">
<td [nzChecked]="groupQuery.tableCheckedId.has(data.id)" [nzDisabled]="data.disabled"
(nzCheckedChange)="onGroupTableItemChecked(data.id, data.groupName, $event)"></td>
<td
[nzChecked]="groupQuery.tableCheckedId.has(data.id)"
[nzDisabled]="data.disabled"
(nzCheckedChange)="onGroupTableItemChecked(data.id, data.groupName, $event)"
></td>
<td nzAlign="left" style="display: none">
<span>{{ data.id }}</span>
</td>
@ -55,25 +74,37 @@
<div nz-col nzMd="8" nzSm="24">
<nz-form-item>
<nz-form-label nzFor="groupName">{{ 'mxk.roles.name' | i18n }}</nz-form-label>
<input nz-input [(ngModel)]="query.params.groupName" [ngModelOptions]="{ standalone: true }" readonly
disabled placeholder="" />
<input
nz-input
[(ngModel)]="query.params.groupName"
[ngModelOptions]="{ standalone: true }"
readonly
disabled
placeholder=""
/>
</nz-form-item>
</div>
<div nz-col nzMd="8" nzSm="24">
<nz-form-item>
<nz-form-label nzFor="name">{{ 'mxk.users.username' | i18n }}</nz-form-label>
<nz-form-control>
<input nz-input [(ngModel)]="query.params.username" [ngModelOptions]="{ standalone: true }"
name="username" placeholder="" id="username" />
<input
nz-input
[(ngModel)]="query.params.username"
[ngModelOptions]="{ standalone: true }"
name="username"
placeholder=""
id="username"
/>
</nz-form-control>
</nz-form-item>
</div>
<div nz-col [nzSpan]="query.expandForm ? 24 : 8" [class.text-right]="query.expandForm">
<button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query'
| i18n }}</button>
<button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' | i18n }}</button>
<button nz-button type="reset" (click)="onReset()" class="mx-sm">{{ 'mxk.text.reset' | i18n }}</button>
<button nz-button (click)="query.expandForm = !query.expandForm" class="mx-sm" style="display: none">
{{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button>
{{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button
>
</div>
</div>
</form>
@ -81,24 +112,46 @@
<nz-card [nzBordered]="false">
<div nz-row [nzGutter]="{ xs: 8, sm: 8, md: 8, lg: 24, xl: 48, xxl: 48 }">
<div nz-col [nzSpan]="24" class="table-list-toolbar">
<button nz-button type="button" [nzType]="'primary'" (click)="onAdd($event)">{{ 'mxk.text.add' | i18n
}}</button>
<button nz-button type="button" (click)="onBatchDelete($event)" [nzType]="'primary'" nzDanger
class="mx-sm">{{
'mxk.text.delete' | i18n
}}</button>
<button nz-button type="button" [nzType]="'primary'" (click)="onAdd($event)">{{ 'mxk.text.add' | i18n }}</button>
<button
nz-button
type="button"
nz-popconfirm
nzPopconfirmTitle="{{ 'mxk.text.delete.popconfirm.title' | i18n }}"
nzPopconfirmPlacement="left"
[nzCancelText]="'mxk.text.delete.popconfirm.cancelText' | i18n"
[nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n"
(nzOnConfirm)="onBatchDelete()"
[nzType]="'primary'"
nzDanger
class="mx-sm"
>{{ 'mxk.text.delete' | i18n }}</button
>
</div>
<div nz-col nzMd="24" nzSm="24">
<nz-table #dynamicTable nzTableLayout="auto" nzSize="small" nzBordered nzShowSizeChanger
[nzData]="query.results.rows" [nzFrontPagination]="false" [nzTotal]="query.results.records"
[nzPageSizeOptions]="query.params.pageSizeOptions" [nzPageSize]="query.params.pageSize"
[nzPageIndex]="query.params.pageNumber" [nzLoading]="this.query.tableLoading"
(nzQueryParams)="onQueryParamsChange($event)">
<nz-table
#dynamicTable
nzTableLayout="auto"
nzSize="small"
nzBordered
nzShowSizeChanger
[nzData]="query.results.rows"
[nzFrontPagination]="false"
[nzTotal]="query.results.records"
[nzPageSizeOptions]="query.params.pageSizeOptions"
[nzPageSize]="query.params.pageSize"
[nzPageIndex]="query.params.pageNumber"
[nzLoading]="this.query.tableLoading"
(nzQueryParams)="onQueryParamsChange($event)"
>
<thead>
<tr>
<th [nzChecked]="query.checked" [nzIndeterminate]="query.indeterminate"
(nzCheckedChange)="onTableAllChecked($event)"></th>
<th
[nzChecked]="query.checked"
[nzIndeterminate]="query.indeterminate"
(nzCheckedChange)="onTableAllChecked($event)"
></th>
<th nzAlign="center">{{ 'mxk.roles.name' | i18n }}</th>
<th nzAlign="center">{{ 'mxk.users.username' | i18n }}</th>
<th nzAlign="center">{{ 'mxk.users.displayName' | i18n }}</th>
@ -110,21 +163,32 @@
</thead>
<tbody>
<tr *ngFor="let data of query.results.rows">
<td [nzChecked]="query.tableCheckedId.has(data.id)" [nzDisabled]="data.disabled"
(nzCheckedChange)="onTableItemChecked(data.id, $event)"></td>
<td
[nzChecked]="query.tableCheckedId.has(data.id)"
[nzDisabled]="data.disabled"
(nzCheckedChange)="onTableItemChecked(data.id, $event)"
></td>
<td nzAlign="left"> {{ data.groupName }}</td>
<td nzAlign="left"> {{ data.username }}</td>
<td nzAlign="left"> {{ data.displayName }}</td>
<td nzAlign="left"> {{ data.department }}</td>
<td nzAlign="left"> {{ data.jobTitle }}</td>
<td nzAlign="center"> {{ data.gender == 1 ? ('mxk.users.gender.female' | i18n) :
('mxk.users.gender.male' | i18n) }}</td>
<td nzAlign="center"> {{ data.gender == 1 ? ('mxk.users.gender.female' | i18n) : ('mxk.users.gender.male' | i18n) }}</td>
<td nzAlign="center" nzBreakWord="false">
<div nz-col>
<button *ngIf="data.category == 'static'" nz-button type="button"
(click)="onDelete($event, data.id)" nzDanger>{{
'mxk.text.delete' | i18n
}}</button>
<button
*ngIf="data.category == 'static'"
nz-button
type="button"
nz-popconfirm
nzPopconfirmTitle="{{ 'mxk.text.delete.popconfirm.title' | i18n }}"
nzPopconfirmPlacement="left"
[nzCancelText]="'mxk.text.delete.popconfirm.cancelText' | i18n"
[nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n"
(nzOnConfirm)="onDelete(data.id)"
nzDanger
>{{ 'mxk.text.delete' | i18n }}</button
>
</div>
</td>
</tr>

8
maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/group-members/group-members.component.ts
View File

@ -106,7 +106,7 @@ export class GroupMembersComponent implements OnInit {
@Inject(ALAIN_I18N_TOKEN) private i18n: I18NService,
private route: ActivatedRoute,
private cdr: ChangeDetectorRef
) { }
) {}
ngOnInit(): void {
if (this.route.snapshot.queryParams['username']) {
@ -138,8 +138,7 @@ export class GroupMembersComponent implements OnInit {
this.fetch();
}
onBatchDelete(e: MouseEvent): void {
e.preventDefault();
onBatchDelete(): void {
this.groupMembersService.delete(set2String(this.query.tableCheckedId)).subscribe(res => {
if (res.code == 0) {
this.msg.success(this.i18n.fanyi('mxk.alert.delete.success'));
@ -210,8 +209,7 @@ export class GroupMembersComponent implements OnInit {
});
}
onDelete(e: MouseEvent, deleteId: String): void {
e.preventDefault();
onDelete(deleteId: String): void {
this.groupMembersService.delete(deleteId).subscribe(res => {
if (res.code == 0) {
this.msg.success(this.i18n.fanyi('mxk.alert.delete.success'));

24
maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/groups.component.html
View File

@ -32,9 +32,20 @@
<nz-card>
<div nz-col [nzSpan]="24" class="table-list-toolbar">
<button nz-button type="button" [nzType]="'primary'" (click)="onAdd($event)">{{ 'mxk.text.add' | i18n }}</button>
<button nz-button type="button" (click)="onBatchDelete($event)" [nzType]="'primary'" nzDanger class="mx-sm">{{
'mxk.text.delete' | i18n
}}</button>
<button
nz-button
type="button"
nz-popconfirm
nzPopconfirmTitle="{{ 'mxk.text.delete.popconfirm.title' | i18n }}"
nzPopconfirmPlacement="left"
[nzCancelText]="'mxk.text.delete.popconfirm.cancelText' | i18n"
[nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n"
(nzOnConfirm)="onBatchDelete()"
[nzType]="'primary'"
nzDanger
class="mx-sm"
>{{ 'mxk.text.delete' | i18n }}</button
>
</div>
<nz-table
#dynamicTable
@ -92,7 +103,12 @@
<li
nz-menu-item
*ngIf="data.roleCode != 'ROLE_ADMINISTRATORS' && data.roleCode != 'ROLE_ALL_USER' && data.roleCode != 'ROLE_MANAGERS'"
(click)="onDelete($event, data.id)"
nz-popconfirm
nzPopconfirmTitle="{{ 'mxk.text.delete.popconfirm.title' | i18n }}"
nzPopconfirmPlacement="left"
[nzCancelText]="'mxk.text.delete.popconfirm.cancelText' | i18n"
[nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n"
(nzOnConfirm)="onDelete(data.id)"
nzDanger
>{{ 'mxk.text.delete' | i18n }}</li
>

10
maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/groups.component.ts
View File

@ -92,7 +92,7 @@ export class GroupsComponent implements OnInit {
private router: Router,
@Inject(ALAIN_I18N_TOKEN) private i18n: I18NService,
private cdr: ChangeDetectorRef
) { }
) {}
ngOnInit(): void {
this.fetch();
@ -108,10 +108,9 @@ export class GroupsComponent implements OnInit {
this.fetch();
}
onReset(): void { }
onReset(): void {}
onBatchDelete(e: MouseEvent): void {
e.preventDefault();
onBatchDelete(): void {
this.groupsService.delete(set2String(this.query.tableCheckedId)).subscribe(res => {
if (res.code == 0) {
this.msg.success(this.i18n.fanyi('mxk.alert.delete.success'));
@ -162,8 +161,7 @@ export class GroupsComponent implements OnInit {
});
}
onDelete(e: MouseEvent, deleteId: String): void {
e.preventDefault();
onDelete(deleteId: String): void {
this.groupsService.delete(deleteId).subscribe(res => {
if (res.code == 0) {
this.msg.success(this.i18n.fanyi('mxk.alert.delete.success'));

95
maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/organizations/organizations.component.html
View File

@ -7,18 +7,23 @@
<nz-form-item>
<nz-form-label nzFor="orgName">{{ 'mxk.organizations.name' | i18n }}</nz-form-label>
<nz-form-control>
<input nz-input [(ngModel)]="query.params.orgName" [ngModelOptions]="{ standalone: true }" name="orgName"
placeholder="" id="orgName" />
<input
nz-input
[(ngModel)]="query.params.orgName"
[ngModelOptions]="{ standalone: true }"
name="orgName"
placeholder=""
id="orgName"
/>
</nz-form-control>
</nz-form-item>
</div>
<div nz-col [nzSpan]="query.expandForm ? 24 : 8" [class.text-right]="query.expandForm">
<button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' |
i18n }}</button>
<button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' |
i18n }}</button>
<button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' | i18n }}</button>
<button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' | i18n }}</button>
<button nz-button (click)="query.expandForm = !query.expandForm" class="mx-sm" style="display: none">
{{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button>
{{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button
>
</div>
</div>
</form>
@ -27,13 +32,31 @@
<div nz-row [nzGutter]="{ xs: 8, sm: 8, md: 8, lg: 24, xl: 48, xxl: 48 }">
<div nz-col [nzSpan]="24" class="table-list-toolbar">
<button nz-button type="button" [nzType]="'primary'" (click)="onAdd($event)">{{ 'mxk.text.add' | i18n }}</button>
<button nz-button type="button" (click)="onBatchDelete($event)" [nzType]="'primary'" nzDanger class="mx-sm">{{
'mxk.text.delete' | i18n
}}</button>
<button
nz-button
type="button"
nz-popconfirm
nzPopconfirmTitle="{{ 'mxk.text.delete.popconfirm.title' | i18n }}"
nzPopconfirmPlacement="left"
[nzCancelText]="'mxk.text.delete.popconfirm.cancelText' | i18n"
[nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n"
(nzOnConfirm)="onBatchDelete()"
[nzType]="'primary'"
nzDanger
class="mx-sm"
>{{ 'mxk.text.delete' | i18n }}</button
>
</div>
<div nz-col nzMd="6" nzSm="24" class="grid-border">
<nz-tree nzShowLine="false" [nzCheckable]="treeNodes.checkable" nzBlockNode [nzData]="treeNodes.nodes"
(nzClick)="activeNode($event)" (nzDblClick)="openFolder($event)" [nzTreeTemplate]="nzTreeTemplate"></nz-tree>
<nz-tree
nzShowLine="false"
[nzCheckable]="treeNodes.checkable"
nzBlockNode
[nzData]="treeNodes.nodes"
(nzClick)="activeNode($event)"
(nzDblClick)="openFolder($event)"
[nzTreeTemplate]="nzTreeTemplate"
></nz-tree>
<ng-template #nzTreeTemplate let-node let-origin="origin">
<span class="custom-node">
<span *ngIf="!node.isLeaf" (contextmenu)="contextMenu($event, menu)">
@ -54,14 +77,24 @@
</nz-dropdown-menu>
</div>
<div nz-col nzMd="18" nzSm="24" class="grid-border">
<nz-table #dynamicTable nzBordered nzShowSizeChanger nzSize="small" [nzData]="query.results.rows" [nzFrontPagination]="false"
[nzTotal]="query.results.records" [nzPageSizeOptions]="query.params.pageSizeOptions"
[nzPageSize]="query.params.pageSize" [nzPageIndex]="query.params.pageNumber"
[nzLoading]="this.query.tableLoading" (nzQueryParams)="onQueryParamsChange($event)" nzWidth="100%">
<nz-table
#dynamicTable
nzBordered
nzShowSizeChanger
nzSize="small"
[nzData]="query.results.rows"
[nzFrontPagination]="false"
[nzTotal]="query.results.records"
[nzPageSizeOptions]="query.params.pageSizeOptions"
[nzPageSize]="query.params.pageSize"
[nzPageIndex]="query.params.pageNumber"
[nzLoading]="this.query.tableLoading"
(nzQueryParams)="onQueryParamsChange($event)"
nzWidth="100%"
>
<thead>
<tr>
<th [nzChecked]="query.checked" [nzIndeterminate]="query.indeterminate"
(nzCheckedChange)="onTableAllChecked($event)"></th>
<th [nzChecked]="query.checked" [nzIndeterminate]="query.indeterminate" (nzCheckedChange)="onTableAllChecked($event)"></th>
<th nzAlign="center" class="table_cell_action_2">{{ 'mxk.organizations.code' | i18n }}</th>
<th nzAlign="center" class="table_cell_action_2">{{ 'mxk.organizations.name' | i18n }}</th>
<th nzAlign="center" class="table_cell_action_1">{{ 'mxk.organizations.type' | i18n }}</th>
@ -72,21 +105,22 @@
</thead>
<tbody>
<tr *ngFor="let data of query.results.rows">
<td [nzChecked]="query.tableCheckedId.has(data.id)" [nzDisabled]="data.disabled"
(nzCheckedChange)="onTableItemChecked(data.id, $event)"></td>
<td
[nzChecked]="query.tableCheckedId.has(data.id)"
[nzDisabled]="data.disabled"
(nzCheckedChange)="onTableItemChecked(data.id, $event)"
></td>
<td nzAlign="left">
<span>{{ data.orgCode }}</span>
</td>
<td nzAlign="left"> {{ data.orgName }}</td>
<td nzAlign="center" *ngIf="data.type == 'company'"> {{ 'mxk.organizations.type.company' | i18n }}</td>
<td nzAlign="center" *ngIf="data.type == 'division'"> {{ 'mxk.organizations.type.division' | i18n }}</td>
<td nzAlign="center" *ngIf="data.type == 'department'"> {{ 'mxk.organizations.type.department' | i18n }}
</td>
<td nzAlign="center" *ngIf="data.type == 'department'"> {{ 'mxk.organizations.type.department' | i18n }} </td>
<td nzAlign="center" *ngIf="data.type == 'entity'"> {{ 'mxk.organizations.type.entity' | i18n }}</td>
<td nzAlign="center" *ngIf="data.type == 'virtual'"> {{ 'mxk.organizations.type.virtual' | i18n }}</td>
<td nzAlign="center"> {{ data.sortIndex }}</td>
<td nzAlign="center"> <i *ngIf="data.status == 1" nz-icon nzType="check-circle" nzTheme="fill"
style="color: green"></i></td>
<td nzAlign="center"> <i *ngIf="data.status == 1" nz-icon nzType="check-circle" nzTheme="fill" style="color: green"></i></td>
<td nzAlign="center" nzBreakWord="false">
<div nz-col>
<button nz-button type="button" (click)="onEdit($event, data.id)">
@ -94,8 +128,17 @@
</button>
<button
*ngIf="data.parentId != null && data.parentId != '-1' && data.parentId != '0' && data.id != data.instId"
nz-button type="button" (click)="onDelete($event, data.id)" nzDanger>{{ 'mxk.text.delete' | i18n
}}</button>
nz-button
type="button"
nz-popconfirm
nzPopconfirmTitle="{{ 'mxk.text.delete.popconfirm.title' | i18n }}"
nzPopconfirmPlacement="left"
[nzCancelText]="'mxk.text.delete.popconfirm.cancelText' | i18n"
[nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n"
(nzOnConfirm)="onDelete(data.id)"
nzDanger
>{{ 'mxk.text.delete' | i18n }}</button
>
</div>
</td>
</tr>

6
maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/organizations/organizations.component.ts
View File

@ -141,8 +141,7 @@ export class OrganizationsComponent implements OnInit {
onReset(): void {}
onBatchDelete(e: MouseEvent): void {
e.preventDefault();
onBatchDelete(): void {
this.orgsService.delete(set2String(this.query.tableCheckedId)).subscribe(res => {
if (res.code == 0) {
this.msg.success(this.i18n.fanyi('mxk.alert.delete.success'));
@ -198,8 +197,7 @@ export class OrganizationsComponent implements OnInit {
});
}
onDelete(e: MouseEvent, deleteId: String): void {
e.preventDefault();
onDelete(deleteId: String): void {
this.orgsService.delete(deleteId).subscribe(res => {
if (res.code == 0) {
this.msg.success(this.i18n.fanyi('mxk.alert.delete.success'));

26
maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/users/users.component.html
View File

@ -37,7 +37,19 @@
<button nz-button type="button" [nzType]="'primary'" (click)="changePassword($event)">
{{ 'mxk.text.changepassword' | i18n }}
</button>
<button nz-button type="button" (click)="onBatchDelete($event)" [nzType]="'primary'" nzDanger class="mx-sm">
<button
nz-button
type="button"
nz-popconfirm
nzPopconfirmTitle="{{ 'mxk.text.delete.popconfirm.title' | i18n }}"
nzPopconfirmPlacement="left"
[nzCancelText]="'mxk.text.delete.popconfirm.cancelText' | i18n"
[nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n"
(nzOnConfirm)="onBatchDelete()"
[nzType]="'primary'"
nzDanger
class="mx-sm"
>
{{ 'mxk.text.delete' | i18n }}
</button>
</div>
@ -169,7 +181,17 @@
<li nz-menu-item *ngIf="data.status == 5" (click)="onUpdateStatus($event, data.id, 1)">{{
'mxk.text.unlock' | i18n
}}</li>
<li nz-menu-item (click)="onDelete($event, data.id)" nzDanger>{{ 'mxk.text.delete' | i18n }}</li>
<li
nz-menu-item
nz-popconfirm
nzPopconfirmTitle="{{ 'mxk.text.delete.popconfirm.title' | i18n }}"
nzPopconfirmPlacement="left"
[nzCancelText]="'mxk.text.delete.popconfirm.cancelText' | i18n"
[nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n"
(nzOnConfirm)="onDelete(data.id)"
nzDanger
>{{ 'mxk.text.delete' | i18n }}</li
>
</ul>
</nz-dropdown-menu>
</div>

6
maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/users/users.component.ts
View File

@ -118,8 +118,7 @@ export class UsersComponent implements OnInit {
onReset(): void {}
onBatchDelete(e: MouseEvent): void {
e.preventDefault();
onBatchDelete(): void {
this.usersService.delete(set2String(this.query.tableCheckedId)).subscribe(res => {
if (res.code == 0) {
this.msg.success(this.i18n.fanyi('mxk.alert.delete.success'));
@ -239,8 +238,7 @@ export class UsersComponent implements OnInit {
});
}
onDelete(e: MouseEvent, deleteId: String): void {
e.preventDefault();
onDelete(deleteId: String): void {
this.usersService.delete(deleteId).subscribe(res => {
if (res.code == 0) {
this.msg.success(this.i18n.fanyi('mxk.alert.operate.success'));

98
maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/resources/resources.component.html
View File

@ -6,26 +6,30 @@
<div nz-col nzMd="10" nzSm="24">
<nz-form-item>
<nz-form-label nzFor="name">{{ 'mxk.resources.appName' | i18n }}</nz-form-label>
<input nz-input [(ngModel)]="query.params.appName" [ngModelOptions]="{ standalone: true }" disabled
placeholder="" />
<input nz-input [(ngModel)]="query.params.appName" [ngModelOptions]="{ standalone: true }" disabled placeholder="" />
</nz-form-item>
</div>
<div nz-col nzMd="10" nzSm="24">
<nz-form-item>
<nz-form-label nzFor="resourceName">{{ 'mxk.resources.name' | i18n }}</nz-form-label>
<nz-form-control>
<input nz-input [(ngModel)]="query.params.resourceName" [ngModelOptions]="{ standalone: true }"
name="resourceName" placeholder="" id="resourceName" />
<input
nz-input
[(ngModel)]="query.params.resourceName"
[ngModelOptions]="{ standalone: true }"
name="resourceName"
placeholder=""
id="resourceName"
/>
</nz-form-control>
</nz-form-item>
</div>
<div nz-col [nzSpan]="query.expandForm ? 24 : 4" [class.text-right]="query.expandForm">
<button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' |
i18n }}</button>
<button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' |
i18n }}</button>
<button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' | i18n }}</button>
<button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' | i18n }}</button>
<button nz-button (click)="query.expandForm = !query.expandForm" class="mx-sm" style="display: none">
{{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button>
{{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button
>
</div>
</div>
</form>
@ -34,13 +38,31 @@
<div nz-row [nzGutter]="{ xs: 8, sm: 8, md: 8, lg: 24, xl: 48, xxl: 48 }">
<div nz-col [nzSpan]="24" class="table-list-toolbar">
<button nz-button type="button" [nzType]="'primary'" (click)="onAdd($event)">{{ 'mxk.text.add' | i18n }}</button>
<button nz-button type="button" (click)="onBatchDelete($event)" [nzType]="'primary'" nzDanger class="mx-sm">{{
'mxk.text.delete' | i18n
}}</button>
<button
nz-button
type="button"
nz-popconfirm
nzPopconfirmTitle="{{ 'mxk.text.delete.popconfirm.title' | i18n }}"
nzPopconfirmPlacement="left"
[nzCancelText]="'mxk.text.delete.popconfirm.cancelText' | i18n"
[nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n"
(nzOnConfirm)="onBatchDelete()"
[nzType]="'primary'"
nzDanger
class="mx-sm"
>{{ 'mxk.text.delete' | i18n }}</button
>
</div>
<div nz-col nzMd="6" nzSm="24" class="grid-border">
<nz-tree nzShowLine="false" [nzCheckable]="treeNodes.checkable" nzBlockNode [nzData]="treeNodes.nodes"
(nzClick)="activeNode($event)" (nzDblClick)="openFolder($event)" [nzTreeTemplate]="nzTreeTemplate"></nz-tree>
<nz-tree
nzShowLine="false"
[nzCheckable]="treeNodes.checkable"
nzBlockNode
[nzData]="treeNodes.nodes"
(nzClick)="activeNode($event)"
(nzDblClick)="openFolder($event)"
[nzTreeTemplate]="nzTreeTemplate"
></nz-tree>
<ng-template #nzTreeTemplate let-node let-origin="origin">
<span class="custom-node">
<span *ngIf="!node.isLeaf" (contextmenu)="contextMenu($event, menu)">
@ -61,15 +83,25 @@
</nz-dropdown-menu>
</div>
<div nz-col nzMd="18" nzSm="24" class="grid-border">
<nz-table #dynamicTable nzTableLayout="auto" nzSize="small" nzBordered nzShowSizeChanger
[nzData]="query.results.rows" [nzFrontPagination]="false" [nzTotal]="query.results.records"
[nzPageSizeOptions]="query.params.pageSizeOptions" [nzPageSize]="query.params.pageSize"
[nzPageIndex]="query.params.pageNumber" [nzLoading]="this.query.tableLoading"
(nzQueryParams)="onQueryParamsChange($event)" nzWidth="100%">
<nz-table
#dynamicTable
nzTableLayout="auto"
nzSize="small"
nzBordered
nzShowSizeChanger
[nzData]="query.results.rows"
[nzFrontPagination]="false"
[nzTotal]="query.results.records"
[nzPageSizeOptions]="query.params.pageSizeOptions"
[nzPageSize]="query.params.pageSize"
[nzPageIndex]="query.params.pageNumber"
[nzLoading]="this.query.tableLoading"
(nzQueryParams)="onQueryParamsChange($event)"
nzWidth="100%"
>
<thead>
<tr>
<th [nzChecked]="query.checked" [nzIndeterminate]="query.indeterminate"
(nzCheckedChange)="onTableAllChecked($event)"></th>
<th [nzChecked]="query.checked" [nzIndeterminate]="query.indeterminate" (nzCheckedChange)="onTableAllChecked($event)"></th>
<th nzAlign="center">{{ 'mxk.resources.appName' | i18n }}</th>
<th nzAlign="center">{{ 'mxk.resources.name' | i18n }}</th>
<th nzAlign="center">{{ 'mxk.resources.resourceType' | i18n }}</th>
@ -80,21 +112,33 @@
</thead>
<tbody>
<tr *ngFor="let data of query.results.rows">
<td [nzChecked]="query.tableCheckedId.has(data.id)" [nzDisabled]="data.disabled"
(nzCheckedChange)="onTableItemChecked(data.id, $event)"></td>
<td
[nzChecked]="query.tableCheckedId.has(data.id)"
[nzDisabled]="data.disabled"
(nzCheckedChange)="onTableItemChecked(data.id, $event)"
></td>
<td nzAlign="center">
{{ data.appName }}
</td>
<td nzAlign="left"> {{ data.resourceName }}</td>
<td nzAlign="left"> {{ data.resourceType }}</td>
<td nzAlign="center"> {{ data.sortIndex }}</td>
<td nzAlign="center"> <i *ngIf="data.status == 1" nz-icon nzType="check-circle" nzTheme="fill"
style="color: green"></i></td>
<td nzAlign="center"> <i *ngIf="data.status == 1" nz-icon nzType="check-circle" nzTheme="fill" style="color: green"></i></td>
<td nzAlign="center" nzBreakWord="false">
<div nz-col>
<button nz-button type="button" (click)="onEdit($event, data.id)">{{ 'mxk.text.edit' | i18n }}</button>
<button nz-button type="button" (click)="onDelete($event, data.id)" nzDanger>{{ 'mxk.text.delete' | i18n
}}</button>
<button
nz-button
type="button"
nz-popconfirm
nzPopconfirmTitle="{{ 'mxk.text.delete.popconfirm.title' | i18n }}"
nzPopconfirmPlacement="left"
[nzCancelText]="'mxk.text.delete.popconfirm.cancelText' | i18n"
[nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n"
(nzOnConfirm)="onDelete(data.id)"
nzDanger
>{{ 'mxk.text.delete' | i18n }}</button
>
</div>
</td>
</tr>

6
maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/resources/resources.component.ts
View File

@ -128,8 +128,7 @@ export class ResourcesComponent implements OnInit {
onReset(): void {}
onBatchDelete(e: MouseEvent): void {
e.preventDefault();
onBatchDelete(): void {
this.resourcesService.delete(set2String(this.query.tableCheckedId)).subscribe(res => {
if (res.code == 0) {
this.msg.success(this.i18n.fanyi('mxk.alert.delete.success'));
@ -205,8 +204,7 @@ export class ResourcesComponent implements OnInit {
});
}
onDelete(e: MouseEvent, deleteId: String): void {
e.preventDefault();
onDelete(deleteId: String): void {
this.resourcesService.delete(deleteId).subscribe(res => {
if (res.code == 0) {
this.msg.success(this.i18n.fanyi('mxk.alert.delete.success'));

120
maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/role-members/role-members.component.html
View File

@ -23,11 +23,21 @@
</div>
</form>
</nz-card>
<nz-table #dynamicTable nzTableLayout="auto" nzSize="small" nzBordered nzShowSizeChanger
[nzData]="leftQuery.results.rows" [nzFrontPagination]="false" [nzTotal]="leftQuery.results.records"
[nzPageSizeOptions]="leftQuery.params.pageSizeOptions" [nzPageSize]="leftQuery.params.pageSize"
[nzPageIndex]="leftQuery.params.pageNumber" [nzLoading]="this.leftQuery.tableLoading"
(nzQueryParams)="onLeftQueryParamsChange($event)">
<nz-table
#dynamicTable
nzTableLayout="auto"
nzSize="small"
nzBordered
nzShowSizeChanger
[nzData]="leftQuery.results.rows"
[nzFrontPagination]="false"
[nzTotal]="leftQuery.results.records"
[nzPageSizeOptions]="leftQuery.params.pageSizeOptions"
[nzPageSize]="leftQuery.params.pageSize"
[nzPageIndex]="leftQuery.params.pageNumber"
[nzLoading]="this.leftQuery.tableLoading"
(nzQueryParams)="onLeftQueryParamsChange($event)"
>
<thead>
<tr>
<!--<th [nzChecked]="query.checked" [nzIndeterminate]="query.indeterminate" (nzCheckedChange)="onTableAllChecked($event)"></th>
@ -39,8 +49,11 @@
</thead>
<tbody>
<tr *ngFor="let data of leftQuery.results.rows">
<td [nzChecked]="leftQuery.tableCheckedId.has(data.id)" [nzDisabled]="data.disabled"
(nzCheckedChange)="onLeftTableItemChecked(data.id, data.roleName, $event)"></td>
<td
[nzChecked]="leftQuery.tableCheckedId.has(data.id)"
[nzDisabled]="data.disabled"
(nzCheckedChange)="onLeftTableItemChecked(data.id, data.roleName, $event)"
></td>
<td nzAlign="left" style="width: 300px">{{ data.id }}</td>
<td nzAlign="left" nzBreakWord="false">{{ data.roleName }}</td>
</tr>
@ -54,25 +67,29 @@
<div nz-col nzMd="8" nzSm="24">
<nz-form-item>
<nz-form-label nzFor="name">{{ 'mxk.roles.name' | i18n }}</nz-form-label>
<input nz-input [(ngModel)]="query.params.selectRoleName" [ngModelOptions]="{ standalone: true }"
disabled />
<input nz-input [(ngModel)]="query.params.selectRoleName" [ngModelOptions]="{ standalone: true }" disabled />
</nz-form-item>
</div>
<div nz-col nzMd="8" nzSm="24">
<nz-form-item>
<nz-form-label nzFor="name">{{ 'mxk.roles.member' | i18n }}</nz-form-label>
<nz-form-control>
<input nz-input [(ngModel)]="query.params.memberName" [ngModelOptions]="{ standalone: true }"
name="memberName" placeholder="" />
<input
nz-input
[(ngModel)]="query.params.memberName"
[ngModelOptions]="{ standalone: true }"
name="memberName"
placeholder=""
/>
</nz-form-control>
</nz-form-item>
</div>
<div nz-col [nzSpan]="query.expandForm ? 24 : 8" [class.text-right]="query.expandForm">
<button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query'
| i18n }}</button>
<button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' | i18n }}</button>
<button nz-button type="reset" (click)="onReset()" class="mx-sm">{{ 'mxk.text.reset' | i18n }}</button>
<button nz-button (click)="query.expandForm = !query.expandForm" class="mx-sm" style="display: none">
{{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button>
{{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button
>
</div>
</div>
</form>
@ -80,24 +97,46 @@
<nz-card [nzBordered]="false">
<div nz-row [nzGutter]="{ xs: 8, sm: 8, md: 8, lg: 24, xl: 48, xxl: 48 }">
<div nz-col [nzSpan]="24" class="table-list-toolbar">
<button nz-button type="button" [nzType]="'primary'" (click)="onAdd($event)">{{ 'mxk.text.add' | i18n
}}</button>
<button nz-button type="button" (click)="onBatchDelete($event)" [nzType]="'primary'" nzDanger
class="mx-sm">{{
'mxk.text.delete' | i18n
}}</button>
<button nz-button type="button" [nzType]="'primary'" (click)="onAdd($event)">{{ 'mxk.text.add' | i18n }}</button>
<button
nz-button
type="button"
nz-popconfirm
nzPopconfirmTitle="{{ 'mxk.text.delete.popconfirm.title' | i18n }}"
nzPopconfirmPlacement="left"
[nzCancelText]="'mxk.text.delete.popconfirm.cancelText' | i18n"
[nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n"
(nzOnConfirm)="onBatchDelete()"
[nzType]="'primary'"
nzDanger
class="mx-sm"
>{{ 'mxk.text.delete' | i18n }}</button
>
</div>
<div nz-col nzMd="24" nzSm="24">
<nz-table #dynamicTable nzTableLayout="auto" nzSize="small" nzBordered nzShowSizeChanger
[nzData]="query.results.rows" [nzFrontPagination]="false" [nzTotal]="query.results.records"
[nzPageSizeOptions]="query.params.pageSizeOptions" [nzPageSize]="query.params.pageSize"
[nzPageIndex]="query.params.pageNumber" [nzLoading]="this.query.tableLoading"
(nzQueryParams)="onQueryParamsChange($event)">
<nz-table
#dynamicTable
nzTableLayout="auto"
nzSize="small"
nzBordered
nzShowSizeChanger
[nzData]="query.results.rows"
[nzFrontPagination]="false"
[nzTotal]="query.results.records"
[nzPageSizeOptions]="query.params.pageSizeOptions"
[nzPageSize]="query.params.pageSize"
[nzPageIndex]="query.params.pageNumber"
[nzLoading]="this.query.tableLoading"
(nzQueryParams)="onQueryParamsChange($event)"
>
<thead>
<tr>
<th [nzChecked]="query.checked" [nzIndeterminate]="query.indeterminate"
(nzCheckedChange)="onTableAllChecked($event)"></th>
<th
[nzChecked]="query.checked"
[nzIndeterminate]="query.indeterminate"
(nzCheckedChange)="onTableAllChecked($event)"
></th>
<th nzAlign="center">{{ 'mxk.roles.name' | i18n }}</th>
<th nzAlign="center">{{ 'mxk.roles.type' | i18n }}</th>
<th nzAlign="center">{{ 'mxk.roles.member' | i18n }}</th>
@ -109,12 +148,14 @@
</thead>
<tbody>
<tr *ngFor="let data of query.results.rows">
<td [nzChecked]="query.tableCheckedId.has(data.id)" [nzDisabled]="data.disabled"
(nzCheckedChange)="onTableItemChecked(data.id, $event)"></td>
<td
[nzChecked]="query.tableCheckedId.has(data.id)"
[nzDisabled]="data.disabled"
(nzCheckedChange)="onTableItemChecked(data.id, $event)"
></td>
<td nzAlign="left"> {{ data.roleName }}</td>
<td nzAlign="center" *ngIf="data.type == 'USER'"> {{ 'mxk.roles.type.user' | i18n }}</td>
<td nzAlign="center" *ngIf="data.type == 'USER-DYNAMIC'"> {{ 'mxk.roles.type.user-dynamic' | i18n }}
</td>
<td nzAlign="center" *ngIf="data.type == 'USER-DYNAMIC'"> {{ 'mxk.roles.type.user-dynamic' | i18n }} </td>
<td nzAlign="center" *ngIf="data.type == 'POST'"> {{ 'mxk.roles.type.post' | i18n }}</td>
<td nzAlign="left"> {{ data.memberName }}</td>
<td nzAlign="left"> {{ data.jobTitle }}</td>
@ -125,10 +166,19 @@
<td nzAlign="left"> {{ data.department }}</td>
<td nzAlign="center" nzBreakWord="false">
<div nz-col>
<button *ngIf="data.type != 'USER-DYNAMIC'" nz-button type="button"
(click)="onDelete($event, data.id)" nzDanger>{{
'mxk.text.delete' | i18n
}}</button>
<button
*ngIf="data.type != 'USER-DYNAMIC'"
nz-button
type="button"
nz-popconfirm
nzPopconfirmTitle="{{ 'mxk.text.delete.popconfirm.title' | i18n }}"
nzPopconfirmPlacement="left"
[nzCancelText]="'mxk.text.delete.popconfirm.cancelText' | i18n"
[nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n"
(nzOnConfirm)="onDelete(data.id)"
nzDanger
>{{ 'mxk.text.delete' | i18n }}</button
>
</div>
</td>
</tr>

8
maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/role-members/role-members.component.ts
View File

@ -92,7 +92,7 @@ export class RoleMembersComponent implements OnInit {
@Inject(ALAIN_I18N_TOKEN) private i18n: I18NService,
private route: ActivatedRoute,
private cdr: ChangeDetectorRef
) { }
) {}
ngOnInit(): void {
if (this.route.snapshot.queryParams['username']) {
@ -134,8 +134,7 @@ export class RoleMembersComponent implements OnInit {
this.fetch();
}
onBatchDelete(e: MouseEvent): void {
e.preventDefault();
onBatchDelete(): void {
this.roleMembersService.delete(set2String(this.query.tableCheckedId)).subscribe(res => {
if (res.code == 0) {
this.msg.success(this.i18n.fanyi('mxk.alert.delete.success'));
@ -206,8 +205,7 @@ export class RoleMembersComponent implements OnInit {
});
}
onDelete(e: MouseEvent, deleteId: String): void {
e.preventDefault();
onDelete(deleteId: String): void {
this.roleMembersService.delete(deleteId).subscribe(res => {
if (res.code == 0) {
this.msg.success(this.i18n.fanyi('mxk.alert.delete.success'));

83
maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/roles/roles.component.html
View File

@ -7,19 +7,24 @@
<nz-form-item>
<nz-form-label nzFor="name">{{ 'mxk.roles.name' | i18n }}</nz-form-label>
<nz-form-control>
<input nz-input [(ngModel)]="query.params.roleName" [ngModelOptions]="{ standalone: true }" name="roleName"
placeholder="" id="roleName" />
<input
nz-input
[(ngModel)]="query.params.roleName"
[ngModelOptions]="{ standalone: true }"
name="roleName"
placeholder=""
id="roleName"
/>
</nz-form-control>
</nz-form-item>
</div>
<div nz-col [nzSpan]="query.expandForm ? 24 : 8" [class.text-right]="query.expandForm">
<button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' |
i18n }}</button>
<button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' |
i18n }}</button>
<button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' | i18n }}</button>
<button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' | i18n }}</button>
<button nz-button (click)="query.expandForm = !query.expandForm" class="mx-sm" style="display: none">
{{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button>
{{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button
>
</div>
</div>
</form>
@ -27,18 +32,40 @@
<nz-card>
<div nz-col [nzSpan]="24" class="table-list-toolbar">
<button nz-button type="button" [nzType]="'primary'" (click)="onAdd($event)">{{ 'mxk.text.add' | i18n }}</button>
<button nz-button type="button" (click)="onBatchDelete($event)" [nzType]="'primary'" nzDanger class="mx-sm">{{
'mxk.text.delete' | i18n
}}</button>
<button
nz-button
type="button"
nz-popconfirm
nzPopconfirmTitle="{{ 'mxk.text.delete.popconfirm.title' | i18n }}"
nzPopconfirmPlacement="left"
[nzCancelText]="'mxk.text.delete.popconfirm.cancelText' | i18n"
[nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n"
(nzOnConfirm)="onBatchDelete()"
[nzType]="'primary'"
nzDanger
class="mx-sm"
>{{ 'mxk.text.delete' | i18n }}</button
>
</div>
<nz-table #dynamicTable nzTableLayout="auto" nzSize="small" nzBordered nzShowSizeChanger [nzData]="query.results.rows"
[nzFrontPagination]="false" [nzTotal]="query.results.records" [nzPageSizeOptions]="query.params.pageSizeOptions"
[nzPageSize]="query.params.pageSize" [nzPageIndex]="query.params.pageNumber" [nzLoading]="this.query.tableLoading"
(nzQueryParams)="onQueryParamsChange($event)" nzWidth="100%">
<nz-table
#dynamicTable
nzTableLayout="auto"
nzSize="small"
nzBordered
nzShowSizeChanger
[nzData]="query.results.rows"
[nzFrontPagination]="false"
[nzTotal]="query.results.records"
[nzPageSizeOptions]="query.params.pageSizeOptions"
[nzPageSize]="query.params.pageSize"
[nzPageIndex]="query.params.pageNumber"
[nzLoading]="this.query.tableLoading"
(nzQueryParams)="onQueryParamsChange($event)"
nzWidth="100%"
>
<thead>
<tr>
<th [nzChecked]="query.checked" [nzIndeterminate]="query.indeterminate"
(nzCheckedChange)="onTableAllChecked($event)"></th>
<th [nzChecked]="query.checked" [nzIndeterminate]="query.indeterminate" (nzCheckedChange)="onTableAllChecked($event)"></th>
<th nzAlign="center" style="display: none">Id</th>
<th nzAlign="center">{{ 'mxk.roles.name' | i18n }}</th>
<th nzAlign="center">{{ 'mxk.roles.category' | i18n }}</th>
@ -48,8 +75,11 @@
</thead>
<tbody>
<tr *ngFor="let data of query.results.rows">
<td [nzChecked]="query.tableCheckedId.has(data.id)" [nzDisabled]="data.disabled"
(nzCheckedChange)="onTableItemChecked(data.id, $event)"></td>
<td
[nzChecked]="query.tableCheckedId.has(data.id)"
[nzDisabled]="data.disabled"
(nzCheckedChange)="onTableItemChecked(data.id, $event)"
></td>
<td nzAlign="left" style="display: none">
<span>{{ data.id }}</span>
</td>
@ -61,14 +91,23 @@
<td nzAlign="center" nzBreakWord="false" width="350px">
<div nz-col>
<button nz-button type=" button" (click)="onEdit($event, data.id)">{{ 'mxk.text.edit' | i18n }}</button>
<button nz-button type="button" (click)="onMembers($event, data.id, data.roleName)">{{ 'mxk.roles.member' |
i18n }}</button>
<button nz-button type="button" (click)="onMembers($event, data.id, data.roleName)">{{ 'mxk.roles.member' | i18n }}</button>
<button nz-button type="button" (click)="onPermissions($event, data.id, data.roleName)">{{
'mxk.roles.permissions' | i18n
}}</button>
<button nz-button type="button" (click)="onDelete($event, data.id)"
<button
nz-button
type="button"
nz-popconfirm
nzPopconfirmTitle="{{ 'mxk.text.delete.popconfirm.title' | i18n }}"
nzPopconfirmPlacement="left"
[nzCancelText]="'mxk.text.delete.popconfirm.cancelText' | i18n"
[nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n"
(nzOnConfirm)="onDelete(data.id)"
*ngIf="data.roleCode != 'ROLE_ADMINISTRATORS' && data.roleCode != 'ROLE_ALL_USER' && data.roleCode != 'ROLE_MANAGERS'"
nzDanger>{{ 'mxk.text.delete' | i18n }}</button>
nzDanger
>{{ 'mxk.text.delete' | i18n }}</button
>
</div>
</td>
</tr>

10
maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/roles/roles.component.ts
View File

@ -82,7 +82,7 @@ export class RolesComponent implements OnInit {
private router: Router,
private route: ActivatedRoute,
private cdr: ChangeDetectorRef
) { }
) {}
ngOnInit(): void {
if (this.route.snapshot.queryParams['appId']) {
@ -102,10 +102,9 @@ export class RolesComponent implements OnInit {
this.fetch();
}
onReset(): void { }
onReset(): void {}
onBatchDelete(e: MouseEvent): void {
e.preventDefault();
onBatchDelete(): void {
this.rolesService.delete(set2String(this.query.tableCheckedId)).subscribe(res => {
if (res.code == 0) {
this.msg.success(this.i18n.fanyi('mxk.alert.delete.success'));
@ -183,8 +182,7 @@ export class RolesComponent implements OnInit {
});
}
onDelete(e: MouseEvent, deleteId: String): void {
e.preventDefault();
onDelete(deleteId: String): void {
this.rolesService.delete(deleteId).subscribe(res => {
if (res.code == 0) {
this.msg.success(this.i18n.fanyi('mxk.alert.delete.success'));

2
maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/consts.ts
View File

@ -19,5 +19,5 @@ export const CONSTS = {
INST: 'inst',
REDIRECT_URI: 'redirect_uri',
REMEMBER: 'remember',
VERSION: 'v4.1.0 GA'
VERSION: 'v4.1.1 GA'
};

5
maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/en-US.json
View File

@ -737,6 +737,11 @@
"add": "Add",
"edit": "Edit",
"delete": "Delete",
"delete.popconfirm":{
"title":"Are you sure you want to delete it?",
"cancelText":"Cancel",
"okText":"Confirm"
},
"test": "Test",
"select": "Select",
"confirm": "Confirm",

5
maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-CN.json
View File

@ -734,6 +734,11 @@
"add": "新增",
"edit": "编辑",
"delete": "删除",
"delete.popconfirm":{
"title":"请确定要删除吗？",
"cancelText":"取消",
"okText":"确定"
},
"test": "测试",
"select": "选择",
"confirm": "确定",

5
maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-TW.json
View File

@ -735,6 +735,11 @@
"add": "新增",
"edit": "編輯",
"delete": "刪除",
"delete.popconfirm":{
"title":"请确定要删除吗？",
"cancelText":"取消",
"okText":"确定"
},
"test": "測試",
"select": "選擇",
"confirm": "確定",