From 65d745a69b1e9e8c3f7eb224cdc5299b5c991a3a Mon Sep 17 00:00:00 2001 From: MaxKey Date: Wed, 31 Jul 2024 16:59:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A0=E9=99=A4=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../maxkey-web-app/src/app/shared/consts.ts | 2 +- .../access/access/access.component.html | 139 +++++++++++----- .../routes/access/access/access.component.ts | 98 ++++++------ .../routes/accounts/accounts.component.html | 132 ++++++++++----- .../app/routes/accounts/accounts.component.ts | 6 +- .../src/app/routes/apps/apps.component.html | 17 +- .../src/app/routes/apps/apps.component.ts | 3 +- .../accounts-strategy.component.html | 30 +++- .../accounts-strategy.component.ts | 6 +- .../config/adapters/adapters.component.html | 30 +++- .../config/adapters/adapters.component.ts | 6 +- .../connectors/connectors.component.html | 128 +++++++++------ .../config/connectors/connectors.component.ts | 13 +- .../socials-provider.component.html | 140 ++++++++++------ .../socials-provider.component.ts | 6 +- .../synchronizers.component.html | 118 +++++++++----- .../synchronizers/synchronizers.component.ts | 6 +- .../group-members.component.html | 142 +++++++++++----- .../group-members/group-members.component.ts | 96 ++++++----- .../routes/idm/groups/groups.component.html | 24 ++- .../app/routes/idm/groups/groups.component.ts | 56 ++++--- .../organizations.component.html | 151 +++++++++++------- .../organizations/organizations.component.ts | 6 +- .../app/routes/idm/users/users.component.html | 26 ++- .../app/routes/idm/users/users.component.ts | 6 +- .../resources/resources.component.html | 100 ++++++++---- .../resources/resources.component.ts | 6 +- .../role-members/role-members.component.html | 124 +++++++++----- .../role-members/role-members.component.ts | 110 +++++++------ .../permissions/roles/roles.component.html | 87 +++++++--- .../permissions/roles/roles.component.ts | 60 ++++--- .../src/app/shared/consts.ts | 2 +- .../src/assets/i18n/en-US.json | 9 +- .../src/assets/i18n/zh-CN.json | 7 +- .../src/assets/i18n/zh-TW.json | 7 +- 35 files changed, 1215 insertions(+), 684 deletions(-) diff --git a/maxkey-web-frontend/maxkey-web-app/src/app/shared/consts.ts b/maxkey-web-frontend/maxkey-web-app/src/app/shared/consts.ts index 2bd226080..d5cd006f3 100644 --- a/maxkey-web-frontend/maxkey-web-app/src/app/shared/consts.ts +++ b/maxkey-web-frontend/maxkey-web-app/src/app/shared/consts.ts @@ -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' }; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/access/access.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/access/access.component.html index 04bf5f520..bb6ef0c09 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/access/access.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/access/access.component.html @@ -8,23 +8,39 @@ {{ 'mxk.groups.name' | i18n }} - +
+ }}
- + @@ -35,8 +51,11 @@ - + {{ data.id }} @@ -55,26 +74,37 @@
{{ 'mxk.roles.name' | i18n }} - +
{{ 'mxk.apps.name' | i18n }} - +
- - + + + {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}
@@ -82,24 +112,46 @@
- - + +
- + - + Id {{ 'mxk.roles.name' | i18n }} {{ 'mxk.apps.icon' | i18n }} @@ -110,8 +162,11 @@ - + {{ data.groupName }} {{ data.appName }} @@ -147,8 +202,18 @@
- +
@@ -159,4 +224,4 @@
- \ No newline at end of file + diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/access/access.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/access/access.component.ts index bfebb9849..c616ab01b 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/access/access.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/access/access.component.ts @@ -67,33 +67,33 @@ export class AccessComponent implements OnInit { indeterminate: boolean; checked: boolean; } = { - params: { - displayName: '', - username: '', - groupId: '', - groupName: '', - appName: '', - appId: '', - startDate: '', - endDate: '', - startDatePicker: addDays(new Date(), -30), - endDatePicker: new Date(), - pageSize: 10, - pageNumber: 1, - pageSizeOptions: [10, 20, 50] - }, - results: { - records: 0, - rows: [] - }, - expandForm: false, - submitLoading: false, - tableLoading: false, - tableInitialize: true, - tableCheckedId: new Set(), - indeterminate: false, - checked: false - }; + params: { + displayName: '', + username: '', + groupId: '', + groupName: '', + appName: '', + appId: '', + startDate: '', + endDate: '', + startDatePicker: addDays(new Date(), -30), + endDatePicker: new Date(), + pageSize: 10, + pageNumber: 1, + pageSizeOptions: [10, 20, 50] + }, + results: { + records: 0, + rows: [] + }, + expandForm: false, + submitLoading: false, + tableLoading: false, + tableInitialize: true, + tableCheckedId: new Set(), + indeterminate: false, + checked: false + }; constructor( private modalService: NzModalService, @@ -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')); @@ -263,23 +261,23 @@ export class AccessComponent implements OnInit { indeterminate: boolean; checked: boolean; } = { - params: { - groupName: '', - pageSize: 10, - pageNumber: 1, - pageSizeOptions: [10, 20, 50] - }, - results: { - records: 0, - rows: [] - }, - expandForm: false, - submitLoading: false, - tableLoading: false, - tableCheckedId: new Set(), - indeterminate: false, - checked: false - }; + params: { + groupName: '', + pageSize: 10, + pageNumber: 1, + pageSizeOptions: [10, 20, 50] + }, + results: { + records: 0, + rows: [] + }, + expandForm: false, + submitLoading: false, + tableLoading: false, + tableCheckedId: new Set(), + indeterminate: false, + checked: false + }; onGroupSearch(): void { this.fetchGroup(); diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/accounts/accounts.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/accounts/accounts.component.html index 751ea4161..6f6ec2dcc 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/accounts/accounts.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/accounts/accounts.component.html @@ -8,12 +8,18 @@ {{ 'mxk.accounts.appName' | i18n }} - + - + @@ -22,18 +28,24 @@ {{ 'mxk.accounts.username' | i18n }} - +
- + + {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}
@@ -41,45 +53,79 @@
- +
- + - - - Id - {{ 'mxk.accounts.username' | i18n }} - {{ 'mxk.accounts.displayName' | i18n }} - {{ 'mxk.accounts.appName' | i18n }} - {{ 'mxk.accounts.relatedUsername' | i18n }} - {{ 'mxk.text.action' | i18n }} - + + + Id + {{ 'mxk.accounts.username' | i18n }} + {{ 'mxk.accounts.displayName' | i18n }} + {{ 'mxk.accounts.appName' | i18n }} + {{ 'mxk.accounts.relatedUsername' | i18n }} + {{ 'mxk.text.action' | i18n }} + - - - - {{ data.id }} - - {{ data.username }} - {{ data.displayName }} - {{ data.appName }} - {{ data.relatedUsername }} + + + + {{ data.id }} + + {{ data.username }} + {{ data.displayName }} + {{ data.appName }} + {{ data.relatedUsername }} - -
- -
- - + +
+ +
+ + diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/accounts/accounts.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/accounts/accounts.component.ts index afafad4e8..b2f9c1164 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/accounts/accounts.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/accounts/accounts.component.ts @@ -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')); diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/apps.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/apps.component.html index 7848f3b04..6c829c4f5 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/apps.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/apps.component.html @@ -56,9 +56,20 @@ 'mxk.text.add' | i18n }} - + { if (res.code == 0) { this.msg.success(this.i18n.fanyi('mxk.alert.delete.success')); diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/accounts-strategy/accounts-strategy.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/accounts-strategy/accounts-strategy.component.html index c27d8a647..c85344414 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/accounts-strategy/accounts-strategy.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/accounts-strategy/accounts-strategy.component.html @@ -25,9 +25,20 @@
- +
- +
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/accounts-strategy/accounts-strategy.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/accounts-strategy/accounts-strategy.component.ts index 6c1dba41c..33163ea4e 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/accounts-strategy/accounts-strategy.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/accounts-strategy/accounts-strategy.component.ts @@ -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')); diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/adapters/adapters.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/adapters/adapters.component.html index 3c397b55e..afee300f4 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/adapters/adapters.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/adapters/adapters.component.html @@ -25,9 +25,20 @@
- +
- +
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/adapters/adapters.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/adapters/adapters.component.ts index 8ec1ed7c4..5fd962057 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/adapters/adapters.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/adapters/adapters.component.ts @@ -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')); diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/connectors/connectors.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/connectors/connectors.component.html index ef02721e8..7a176f417 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/connectors/connectors.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/connectors/connectors.component.html @@ -7,69 +7,105 @@ {{ 'mxk.connectors.connName' | i18n }} - +
- - + + + {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}
- - + +
- + - - - Id - {{ 'mxk.connectors.connName' | i18n }} - {{ 'mxk.connectors.justInTime' | i18n }} - {{ 'mxk.text.status' | i18n }} - {{ 'mxk.text.action' | i18n }} - + + + Id + {{ 'mxk.connectors.connName' | i18n }} + {{ 'mxk.connectors.justInTime' | i18n }} + {{ 'mxk.text.status' | i18n }} + {{ 'mxk.text.action' | i18n }} + - - - - {{ data.id }} - + + + + {{ data.id }} + - {{ data.connName }} - {{ 'mxk.text.yes' | i18n }} - {{ 'mxk.text.no' | i18n }} - - -
- - -
- - + {{ data.connName }} + {{ 'mxk.text.yes' | i18n }} + {{ 'mxk.text.no' | i18n }} + + +
+ + +
+ + diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/connectors/connectors.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/connectors/connectors.component.ts index 6cb6b5cb9..ad611abca 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/connectors/connectors.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/connectors/connectors.component.ts @@ -1,19 +1,18 @@ /* * Copyright [2024] [MaxKey of copyright http://www.maxkey.top] - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ - import { ChangeDetectionStrategy, ViewContainerRef, ChangeDetectorRef, Component, OnInit, Inject } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; @@ -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')); diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/socials-provider/socials-provider.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/socials-provider/socials-provider.component.html index 609db8b05..6fdcd8624 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/socials-provider/socials-provider.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/socials-provider/socials-provider.component.html @@ -7,19 +7,24 @@ {{ 'mxk.socialsproviders.providerName' | i18n }} - +
- - + + + {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}
@@ -27,57 +32,88 @@
- +
- + - - - Id - {{ 'mxk.socialsproviders.icon' | i18n }} - {{ 'mxk.socialsproviders.provider' | i18n }} - {{ 'mxk.socialsproviders.providerName' | i18n }} - {{ 'mxk.text.sortIndex' | i18n }} - {{ 'mxk.socialsproviders.display' | i18n }} - {{ 'mxk.socialsproviders.scanCode' | i18n }} + + + Id + {{ 'mxk.socialsproviders.icon' | i18n }} + {{ 'mxk.socialsproviders.provider' | i18n }} + {{ 'mxk.socialsproviders.providerName' | i18n }} + {{ 'mxk.text.sortIndex' | i18n }} + {{ 'mxk.socialsproviders.display' | i18n }} + {{ 'mxk.socialsproviders.scanCode' | i18n }} - {{ 'mxk.text.status' | i18n }} - {{ 'mxk.text.action' | i18n }} - + {{ 'mxk.text.status' | i18n }} + {{ 'mxk.text.action' | i18n }} + - - - - {{ data.id }} - - - {{ data.provider }} - {{ data.providerName }} - {{ data.sortIndex }} - - + + + + {{ data.id }} + + + {{ data.provider }} + {{ data.providerName }} + {{ data.sortIndex }} + + - - -
- - -
- - + + +
+ + +
+ + diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/socials-provider/socials-provider.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/socials-provider/socials-provider.component.ts index 0d2b88939..4a0dd9b66 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/socials-provider/socials-provider.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/socials-provider/socials-provider.component.ts @@ -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')); diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/synchronizers/synchronizers.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/synchronizers/synchronizers.component.html index fd1f63427..3196aa7e8 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/synchronizers/synchronizers.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/synchronizers/synchronizers.component.html @@ -7,19 +7,17 @@ {{ 'mxk.synchronizers.name' | i18n }} - +
- - + + + {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}
@@ -27,48 +25,80 @@
- +
- + - - - Id - {{ 'mxk.synchronizers.name' | i18n }} - {{ 'mxk.synchronizers.scheduler' | i18n }} - {{ 'mxk.text.status' | i18n }} - {{ 'mxk.text.action' | i18n }} - + + + Id + {{ 'mxk.synchronizers.name' | i18n }} + {{ 'mxk.synchronizers.scheduler' | i18n }} + {{ 'mxk.text.status' | i18n }} + {{ 'mxk.text.action' | i18n }} + - - - - {{ data.id }} - + + + + {{ data.id }} + - {{ data.name }} - {{ data.scheduler }} - - -
- - - -
- - + {{ data.name }} + {{ data.scheduler }} + + +
+ + + +
+ + diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/synchronizers/synchronizers.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/synchronizers/synchronizers.component.ts index bfbab6f7a..f775b6f64 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/synchronizers/synchronizers.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/synchronizers/synchronizers.component.ts @@ -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')); diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/group-members/group-members.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/group-members/group-members.component.html index bed3a060a..526fc2c5e 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/group-members/group-members.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/group-members/group-members.component.html @@ -8,23 +8,39 @@ {{ 'mxk.groups.name' | i18n }} - +
+ }}
- + @@ -35,8 +51,11 @@ - + {{ data.id }} @@ -55,25 +74,37 @@
{{ 'mxk.roles.name' | i18n }} - +
{{ 'mxk.users.username' | i18n }} - +
- + + {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}
@@ -81,24 +112,46 @@
- - + +
- + - + {{ 'mxk.roles.name' | i18n }} {{ 'mxk.users.username' | i18n }} {{ 'mxk.users.displayName' | i18n }} @@ -110,21 +163,32 @@ - + {{ data.groupName }} {{ data.username }} {{ data.displayName }} {{ data.department }} {{ data.jobTitle }} - {{ data.gender == 1 ? ('mxk.users.gender.female' | i18n) : - ('mxk.users.gender.male' | i18n) }} + {{ data.gender == 1 ? ('mxk.users.gender.female' | i18n) : ('mxk.users.gender.male' | i18n) }}
- +
@@ -135,4 +199,4 @@
- \ No newline at end of file + diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/group-members/group-members.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/group-members/group-members.component.ts index ba1bb8000..a1b58d1c1 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/group-members/group-members.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/group-members/group-members.component.ts @@ -68,33 +68,33 @@ export class GroupMembersComponent implements OnInit { indeterminate: boolean; checked: boolean; } = { - params: { - groupName: '', - displayName: '', - username: '', - groupId: '', - appName: '', - appId: '', - startDate: '', - endDate: '', - startDatePicker: addDays(new Date(), -30), - endDatePicker: new Date(), - pageSize: 10, - pageNumber: 1, - pageSizeOptions: [10, 20, 50] - }, - results: { - records: 0, - rows: [] - }, - expandForm: false, - submitLoading: false, - tableLoading: false, - tableInitialize: true, - tableCheckedId: new Set(), - indeterminate: false, - checked: false - }; + params: { + groupName: '', + displayName: '', + username: '', + groupId: '', + appName: '', + appId: '', + startDate: '', + endDate: '', + startDatePicker: addDays(new Date(), -30), + endDatePicker: new Date(), + pageSize: 10, + pageNumber: 1, + pageSizeOptions: [10, 20, 50] + }, + results: { + records: 0, + rows: [] + }, + expandForm: false, + submitLoading: false, + tableLoading: false, + tableInitialize: true, + tableCheckedId: new Set(), + indeterminate: false, + checked: false + }; constructor( private modalService: NzModalService, @@ -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')); @@ -288,23 +286,23 @@ export class GroupMembersComponent implements OnInit { indeterminate: boolean; checked: boolean; } = { - params: { - groupName: '', - pageSize: 10, - pageNumber: 1, - pageSizeOptions: [10, 20, 50] - }, - results: { - records: 0, - rows: [] - }, - expandForm: false, - submitLoading: false, - tableLoading: false, - tableCheckedId: new Set(), - indeterminate: false, - checked: false - }; + params: { + groupName: '', + pageSize: 10, + pageNumber: 1, + pageSizeOptions: [10, 20, 50] + }, + results: { + records: 0, + rows: [] + }, + expandForm: false, + submitLoading: false, + tableLoading: false, + tableCheckedId: new Set(), + indeterminate: false, + checked: false + }; onGroupSearch(): void { this.fetchGroup(); diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/groups.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/groups.component.html index d6dd737bd..ffccb059b 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/groups.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/groups.component.html @@ -32,9 +32,20 @@
- +
{{ 'mxk.text.delete' | i18n }} diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/groups.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/groups.component.ts index 4cbd9dbf4..c2c26ce5f 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/groups.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/groups.component.ts @@ -59,29 +59,29 @@ export class GroupsComponent implements OnInit { indeterminate: boolean; checked: boolean; } = { - params: { - groupName: '', - displayName: '', - employeeNumber: '', - startDate: '', - endDate: '', - startDatePicker: addDays(new Date(), -30), - endDatePicker: new Date(), - pageSize: 10, - pageNumber: 1, - pageSizeOptions: [10, 20, 50] - }, - results: { - records: 0, - rows: [] - }, - expandForm: false, - submitLoading: false, - tableLoading: false, - tableCheckedId: new Set(), - indeterminate: false, - checked: false - }; + params: { + groupName: '', + displayName: '', + employeeNumber: '', + startDate: '', + endDate: '', + startDatePicker: addDays(new Date(), -30), + endDatePicker: new Date(), + pageSize: 10, + pageNumber: 1, + pageSizeOptions: [10, 20, 50] + }, + results: { + records: 0, + rows: [] + }, + expandForm: false, + submitLoading: false, + tableLoading: false, + tableCheckedId: new Set(), + indeterminate: false, + checked: false + }; constructor( private modalService: NzModalService, @@ -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')); diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/organizations/organizations.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/organizations/organizations.component.html index d772c7645..507a1dd35 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/organizations/organizations.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/organizations/organizations.component.html @@ -7,18 +7,23 @@ {{ 'mxk.organizations.name' | i18n }} - +
- - + + + {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}
@@ -27,13 +32,31 @@
- +
- + @@ -54,51 +77,71 @@
- + - - - {{ 'mxk.organizations.code' | i18n }} - {{ 'mxk.organizations.name' | i18n }} - {{ 'mxk.organizations.type' | i18n }} - {{ 'mxk.text.sortIndex' | i18n }} - {{ 'mxk.text.status' | i18n }} - {{ 'mxk.text.action' | i18n }} - + + + {{ 'mxk.organizations.code' | i18n }} + {{ 'mxk.organizations.name' | i18n }} + {{ 'mxk.organizations.type' | i18n }} + {{ 'mxk.text.sortIndex' | i18n }} + {{ 'mxk.text.status' | i18n }} + {{ 'mxk.text.action' | i18n }} + - - - - {{ data.orgCode }} - - {{ data.orgName }} - {{ 'mxk.organizations.type.company' | i18n }} - {{ 'mxk.organizations.type.division' | i18n }} - {{ 'mxk.organizations.type.department' | i18n }} - - {{ 'mxk.organizations.type.entity' | i18n }} - {{ 'mxk.organizations.type.virtual' | i18n }} - {{ data.sortIndex }} - - -
- - -
- - + + + + {{ data.orgCode }} + + {{ data.orgName }} + {{ 'mxk.organizations.type.company' | i18n }} + {{ 'mxk.organizations.type.division' | i18n }} + {{ 'mxk.organizations.type.department' | i18n }} + {{ 'mxk.organizations.type.entity' | i18n }} + {{ 'mxk.organizations.type.virtual' | i18n }} + {{ data.sortIndex }} + + +
+ + +
+ +
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/organizations/organizations.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/organizations/organizations.component.ts index 0a8b38fbe..c646461cd 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/organizations/organizations.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/organizations/organizations.component.ts @@ -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')); diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/users/users.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/users/users.component.html index f02a50beb..4c8078fd2 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/users/users.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/users/users.component.html @@ -37,7 +37,19 @@ -
@@ -169,7 +181,17 @@
  • {{ 'mxk.text.unlock' | i18n }}
    • -
  • {{ 'mxk.text.delete' | i18n }}
    • +
  • {{ 'mxk.text.delete' | i18n }}
    • diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/users/users.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/users/users.component.ts index 2a2d244cc..b248c1e61 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/users/users.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/users/users.component.ts @@ -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')); diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/resources/resources.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/resources/resources.component.html index 3f24a66dd..d7f97b82e 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/resources/resources.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/resources/resources.component.html @@ -6,26 +6,30 @@
    {{ 'mxk.resources.appName' | i18n }} - +
    {{ 'mxk.resources.name' | i18n }} - +
    - - + + + {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}
    @@ -34,13 +38,31 @@
    - +
    - + @@ -61,15 +83,25 @@
    - + - + {{ 'mxk.resources.appName' | i18n }} {{ 'mxk.resources.name' | i18n }} {{ 'mxk.resources.resourceType' | i18n }} @@ -80,21 +112,33 @@ - + {{ data.appName }} {{ data.resourceName }} {{ data.resourceType }} {{ data.sortIndex }} - +
    - +
    @@ -102,4 +146,4 @@
    -     \ No newline at end of file + diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/resources/resources.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/resources/resources.component.ts index d27732de5..90d46f38b 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/resources/resources.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/resources/resources.component.ts @@ -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')); diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/role-members/role-members.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/role-members/role-members.component.html index e4aa6e310..0a62bb8c1 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/role-members/role-members.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/role-members/role-members.component.html @@ -18,16 +18,26 @@
    + }}
    - +