diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/app.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/app.component.ts index be091f28..ab44b600 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/app.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/app.component.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { Component, ElementRef, OnInit, Renderer2 } from '@angular/core'; import { NavigationEnd, NavigationError, RouteConfigLoadStart, Router } from '@angular/router'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/app.module.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/app.module.ts index c89812fd..f230c092 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/app.module.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/app.module.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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. */ - /* eslint-disable import/order */ /* eslint-disable import/no-duplicates */ diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/core/core.module.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/core/core.module.ts index 7f93b9f1..6bd6ab9d 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/core/core.module.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/core/core.module.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { NgModule, Optional, SkipSelf } from '@angular/core'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/core/index.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/core/index.ts index 93928980..157b54fe 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/core/index.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/core/index.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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. */ - export * from './i18n/i18n.service'; export * from './module-import-guard'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/core/module-import-guard.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/core/module-import-guard.ts index 1c6f9fa8..2be2476b 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/core/module-import-guard.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/core/module-import-guard.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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. */ - // https://angular.io/guide/styleguide#style-04-12 export function throwIfAlreadyLoaded(parentModule: any, moduleName: string): void { diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/core/startup/startup.service.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/core/startup/startup.service.ts index 601b0f44..70124a63 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/core/startup/startup.service.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/core/startup/startup.service.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { HttpClient } from '@angular/common/http'; import { Inject, Injectable } from '@angular/core'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Accounts.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Accounts.ts index f89c9aef..68404b41 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Accounts.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Accounts.ts @@ -1,53 +1,52 @@ /* * Copyright [2022] [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 format from 'date-fns/format'; import { BaseEntity } from './BaseEntity'; export class Accounts extends BaseEntity { - strategyId!: String; - strategyName!: String; - appId!: String; - appName!: String; - userId!: String; - username!: String; - displayName!: String; - relatedUsername!: String; - relatedPassword!: String; - createType!: String; + strategyId!: String; + strategyName!: String; + appId!: String; + appName!: String; + userId!: String; + username!: String; + displayName!: String; + relatedUsername!: String; + relatedPassword!: String; + createType!: String; - constructor() { - super(); - this.createType = 'manual'; - } + constructor() { + super(); + this.createType = 'manual'; + } - override init(data: any): void { - Object.assign(this, data); - if (this.status == 1) { - this.switch_status = true; - } + override init(data: any): void { + Object.assign(this, data); + if (this.status == 1) { + this.switch_status = true; } + } - override trans(): void { - if (this.switch_status) { - this.status = 1; - } else { - this.status = 0; - } + override trans(): void { + if (this.switch_status) { + this.status = 1; + } else { + this.status = 0; } + } } diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AccountsStrategy.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AccountsStrategy.ts index 4bd7c01b..13343201 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AccountsStrategy.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AccountsStrategy.ts @@ -1,55 +1,54 @@ /* * Copyright [2022] [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 format from 'date-fns/format'; import { BaseEntity } from './BaseEntity'; export class AccountsStrategy extends BaseEntity { - name!: String; - appId!: String; - appName!: String; - filters!: String; - orgIdsList!: String; - mapping!: String; - suffixes!: String; - createType!: String; - switch_dynamic: boolean = false; - picker_resumeTime: Date = new Date(format(new Date(), 'yyyy-MM-dd 00:00:00')); - picker_suspendTime: Date = new Date(format(new Date(), 'yyyy-MM-dd 00:00:00')); + name!: String; + appId!: String; + appName!: String; + filters!: String; + orgIdsList!: String; + mapping!: String; + suffixes!: String; + createType!: String; + switch_dynamic: boolean = false; + picker_resumeTime: Date = new Date(format(new Date(), 'yyyy-MM-dd 00:00:00')); + picker_suspendTime: Date = new Date(format(new Date(), 'yyyy-MM-dd 00:00:00')); - constructor() { - super(); - this.createType = 'manual'; - this.mapping = 'username'; - } + constructor() { + super(); + this.createType = 'manual'; + this.mapping = 'username'; + } - override init(data: any): void { - Object.assign(this, data); - if (this.status == 1) { - this.switch_status = true; - } + override init(data: any): void { + Object.assign(this, data); + if (this.status == 1) { + this.switch_status = true; } + } - override trans(): void { - if (this.switch_status) { - this.status = 1; - } else { - this.status = 0; - } + override trans(): void { + if (this.switch_status) { + this.status = 1; + } else { + this.status = 0; } + } } diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Adapters.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Adapters.ts index d8e6b41d..95ecf289 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Adapters.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Adapters.ts @@ -1,45 +1,44 @@ /* * Copyright [2022] [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 format from 'date-fns/format'; import { BaseEntity } from './BaseEntity'; export class Adapters extends BaseEntity { - name!: String; - protocol!: String; - adapter!: String; - switch_dynamic: boolean = false; + name!: String; + protocol!: String; + adapter!: String; + switch_dynamic: boolean = false; - constructor() { - super(); - } + constructor() { + super(); + } - override init(data: any): void { - Object.assign(this, data); - if (this.status == 1) { - this.switch_status = true; - } + override init(data: any): void { + Object.assign(this, data); + if (this.status == 1) { + this.switch_status = true; } - override trans(): void { - if (this.switch_status) { - this.status = 1; - } else { - this.status = 0; - } + } + override trans(): void { + if (this.switch_status) { + this.status = 1; + } else { + this.status = 0; } + } } diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsCasDetails.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsCasDetails.ts index 8573765e..7c176185 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsCasDetails.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsCasDetails.ts @@ -19,32 +19,32 @@ import format from 'date-fns/format'; import { Apps } from './Apps'; export class AppsCasDetails extends Apps { - service!: String; - callbackUrl!: String; - casUser!: String; - expires!: Number; + service!: String; + callbackUrl!: String; + casUser!: String; + expires!: Number; - constructor() { - super(); - this.expires = 300; - this.casUser = 'username'; - } + constructor() { + super(); + this.expires = 300; + this.casUser = 'username'; + } - override init(data: any): void { - Object.assign(this, data); - super.init(data); - if (this.status == 1) { - this.switch_status = true; - } else { - this.switch_status = false; - } + override init(data: any): void { + Object.assign(this, data); + super.init(data); + if (this.status == 1) { + this.switch_status = true; + } else { + this.switch_status = false; } + } - override trans(): void { - if (this.switch_status) { - this.status = 1; - } else { - this.status = 0; - } + override trans(): void { + if (this.switch_status) { + this.status = 1; + } else { + this.status = 0; } + } } diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsExtendApiDetails.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsExtendApiDetails.ts index 22c41e7e..a2672b89 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsExtendApiDetails.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsExtendApiDetails.ts @@ -19,25 +19,25 @@ import format from 'date-fns/format'; import { Apps } from './Apps'; export class AppsExtendApiDetails extends Apps { - constructor() { - super(); - } + constructor() { + super(); + } - override init(data: any): void { - Object.assign(this, data); - super.init(data); - if (this.status == 1) { - this.switch_status = true; - } else { - this.switch_status = false; - } + override init(data: any): void { + Object.assign(this, data); + super.init(data); + if (this.status == 1) { + this.switch_status = true; + } else { + this.switch_status = false; } + } - override trans(): void { - if (this.switch_status) { - this.status = 1; - } else { - this.status = 0; - } + override trans(): void { + if (this.switch_status) { + this.status = 1; + } else { + this.status = 0; } + } } diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsOauth20Details.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsOauth20Details.ts index 814682fd..f3f3ec11 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsOauth20Details.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsOauth20Details.ts @@ -19,117 +19,117 @@ import format from 'date-fns/format'; import { Apps } from './Apps'; export class AppsOauth20Details extends Apps { - clientId!: String; + clientId!: String; - clientSecret!: String; + clientSecret!: String; - scope!: String; + scope!: String; - resourceIds!: String; + resourceIds!: String; - authorizedGrantTypes!: String; + authorizedGrantTypes!: String; - registeredRedirectUris!: String; + registeredRedirectUris!: String; - authorities!: String; + authorities!: String; - accessTokenValiditySeconds!: String; + accessTokenValiditySeconds!: String; - refreshTokenValiditySeconds!: String; + refreshTokenValiditySeconds!: String; - approvalPrompt!: String; + approvalPrompt!: String; - // for OpenID Connect + // for OpenID Connect - issuer!: String; + issuer!: String; - audience!: String; + audience!: String; - algorithm!: String; + algorithm!: String; - algorithmKey!: String; + algorithmKey!: String; - encryptionMethod!: String; + encryptionMethod!: String; - signature!: String; + signature!: String; - signatureKey!: String; + signatureKey!: String; - subject!: String; + subject!: String; - userInfoResponse!: String; + userInfoResponse!: String; - pkce!: String; + pkce!: String; - select_authorizedGrantTypes!: string[]; + select_authorizedGrantTypes!: string[]; - select_scope!: string[]; + select_scope!: string[]; - constructor() { - super(); - this.select_authorizedGrantTypes = ['authorization_code']; - this.select_scope = ['read']; - this.pkce = 'no'; - this.approvalPrompt = 'auto'; - this.accessTokenValiditySeconds = '300'; - this.refreshTokenValiditySeconds = '300'; - this.subject = 'username'; + constructor() { + super(); + this.select_authorizedGrantTypes = ['authorization_code']; + this.select_scope = ['read']; + this.pkce = 'no'; + this.approvalPrompt = 'auto'; + this.accessTokenValiditySeconds = '300'; + this.refreshTokenValiditySeconds = '300'; + this.subject = 'username'; + } + + override init(data: any): void { + Object.assign(this, data); + super.init(data); + if (this.status == 1) { + this.switch_status = true; + } else { + this.switch_status = false; + } + if (this.approvalPrompt == '') { + } + this.select_scope = ['']; + let scopeArray: String[] = `${this.scope},`.split(','); + for (let i = 0; i < scopeArray.length; i++) { + this.select_scope.push(`${scopeArray[i]}`); } - override init(data: any): void { - Object.assign(this, data); - super.init(data); - if (this.status == 1) { - this.switch_status = true; + this.select_authorizedGrantTypes = ['']; + let authorizedGrantTypesArray = `${this.authorizedGrantTypes},`.split(','); + for (let i = 0; i < authorizedGrantTypesArray.length; i++) { + this.select_authorizedGrantTypes.push(authorizedGrantTypesArray[i]); + } + if (this.pkce == null || this.pkce == '') { + this.pkce = 'no'; + } + this.pkce = this.pkce.toLowerCase(); + } + + override trans(): void { + if (this.switch_status) { + this.status = 1; + } else { + this.status = 0; + } + this.scope = ''; + + for (let i = 0; i < this.select_scope.length; i++) { + if (this.select_scope[i] != '') { + if (this.scope === '') { + this.scope = this.select_scope[i]; } else { - this.switch_status = false; + this.scope = `${this.scope},${this.select_scope[i]}`; } - if (this.approvalPrompt == '') { - } - this.select_scope = ['']; - let scopeArray: String[] = `${this.scope},`.split(','); - for (let i = 0; i < scopeArray.length; i++) { - this.select_scope.push(`${scopeArray[i]}`); - } - - this.select_authorizedGrantTypes = ['']; - let authorizedGrantTypesArray = `${this.authorizedGrantTypes},`.split(','); - for (let i = 0; i < authorizedGrantTypesArray.length; i++) { - this.select_authorizedGrantTypes.push(authorizedGrantTypesArray[i]); - } - if (this.pkce == null || this.pkce == '') { - this.pkce = 'no'; - } - this.pkce = this.pkce.toLowerCase(); + } } - - override trans(): void { - if (this.switch_status) { - this.status = 1; + this.authorizedGrantTypes = ''; + let n = 0; + for (let i = 0; i < this.select_authorizedGrantTypes.length; i++) { + if (this.select_authorizedGrantTypes[i] != '') { + if (this.authorizedGrantTypes === '') { + this.authorizedGrantTypes = this.select_authorizedGrantTypes[i]; } else { - this.status = 0; - } - this.scope = ''; - - for (let i = 0; i < this.select_scope.length; i++) { - if (this.select_scope[i] != '') { - if (this.scope === '') { - this.scope = this.select_scope[i]; - } else { - this.scope = `${this.scope},${this.select_scope[i]}`; - } - } - } - this.authorizedGrantTypes = ''; - let n = 0; - for (let i = 0; i < this.select_authorizedGrantTypes.length; i++) { - if (this.select_authorizedGrantTypes[i] != '') { - if (this.authorizedGrantTypes === '') { - this.authorizedGrantTypes = this.select_authorizedGrantTypes[i]; - } else { - this.authorizedGrantTypes = `${this.authorizedGrantTypes},${this.select_authorizedGrantTypes[i]}`; - } - } + this.authorizedGrantTypes = `${this.authorizedGrantTypes},${this.select_authorizedGrantTypes[i]}`; } + } } + } } diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsTokenBasedDetails.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsTokenBasedDetails.ts index 8c322538..3e39accd 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsTokenBasedDetails.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsTokenBasedDetails.ts @@ -19,36 +19,36 @@ import format from 'date-fns/format'; import { Apps } from './Apps'; export class AppsTokenBasedDetails extends Apps { - redirectUri!: String; - tokenType!: String; - cookieName!: String; - algorithm!: String; - algorithmKey!: String; - expires!: Number; + redirectUri!: String; + tokenType!: String; + cookieName!: String; + algorithm!: String; + algorithmKey!: String; + expires!: Number; - constructor() { - super(); - this.expires = 300; - this.tokenType = 'POST'; - this.cookieName = 'ltpa_token'; - this.algorithm = 'AES'; - } + constructor() { + super(); + this.expires = 300; + this.tokenType = 'POST'; + this.cookieName = 'ltpa_token'; + this.algorithm = 'AES'; + } - override init(data: any): void { - Object.assign(this, data); - super.init(data); - if (this.status == 1) { - this.switch_status = true; - } else { - this.switch_status = false; - } + override init(data: any): void { + Object.assign(this, data); + super.init(data); + if (this.status == 1) { + this.switch_status = true; + } else { + this.switch_status = false; } + } - override trans(): void { - if (this.switch_status) { - this.status = 1; - } else { - this.status = 0; - } + override trans(): void { + if (this.switch_status) { + this.status = 1; + } else { + this.status = 0; } + } } diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/BaseEntity.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/BaseEntity.ts index a8daf916..fcbe3d37 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/BaseEntity.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/BaseEntity.ts @@ -15,31 +15,31 @@ */ export class BaseEntity { - id!: String; - instId!: String; - instName!: String; - sortIndex!: Number; - status!: Number; - description!: String; - switch_status: boolean = false; - str_status!: String; + id!: String; + instId!: String; + instName!: String; + sortIndex!: Number; + status!: Number; + description!: String; + switch_status: boolean = false; + str_status!: String; - constructor() { - this.status = 1; - this.sortIndex = 1; - this.switch_status = true; + constructor() { + this.status = 1; + this.sortIndex = 1; + this.switch_status = true; + } + init(data: any): void { + Object.assign(this, data); + if (this.status == 1) { + this.switch_status = true; } - init(data: any): void { - Object.assign(this, data); - if (this.status == 1) { - this.switch_status = true; - } - } - trans(): void { - if (this.switch_status) { - this.status = 1; - } else { - this.status = 0; - } + } + trans(): void { + if (this.switch_status) { + this.status = 1; + } else { + this.status = 0; } + } } diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/ChangePassword.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/ChangePassword.ts index 64d51437..ef0d8c8e 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/ChangePassword.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/ChangePassword.ts @@ -1,30 +1,29 @@ /* * Copyright [2022] [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 { BaseEntity } from './BaseEntity'; export class ChangePassword extends BaseEntity { - userId!: String; - username!: String; - email!: String; - mobile!: String; - displayName!: String; - oldPassword!: String; - password!: String; - confirmPassword!: String; - decipherable!: String; + userId!: String; + username!: String; + email!: String; + mobile!: String; + displayName!: String; + oldPassword!: String; + password!: String; + confirmPassword!: String; + decipherable!: String; } diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Connectors.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Connectors.ts index 81b4b08b..1451616d 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Connectors.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Connectors.ts @@ -19,48 +19,48 @@ import format from 'date-fns/format'; import { BaseEntity } from './BaseEntity'; export class Connectors extends BaseEntity { - connName!: String; - justInTime!: Number; - filters!: String; - scheduler!: String; - providerUrl!: String; - principal!: String; - credentials!: String; + connName!: String; + justInTime!: Number; + filters!: String; + scheduler!: String; + providerUrl!: String; + principal!: String; + credentials!: String; - switch_justInTime: boolean = true; + switch_justInTime: boolean = true; - constructor() { - super(); - this.status = 1; - this.justInTime = 1; + constructor() { + super(); + this.status = 1; + this.justInTime = 1; + } + + override init(data: any): void { + Object.assign(this, data); + if (this.status == 1) { + this.switch_status = true; + } else { + this.switch_status = false; } - override init(data: any): void { - Object.assign(this, data); - if (this.status == 1) { - this.switch_status = true; - } else { - this.switch_status = false; - } + if (this.justInTime == 1) { + this.switch_justInTime = true; + } else { + this.switch_justInTime = false; + } + } - if (this.justInTime == 1) { - this.switch_justInTime = true; - } else { - this.switch_justInTime = false; - } + override trans(): void { + if (this.switch_status) { + this.status = 1; + } else { + this.status = 0; } - override trans(): void { - if (this.switch_status) { - this.status = 1; - } else { - this.status = 0; - } - - if (this.switch_justInTime) { - this.justInTime = 1; - } else { - this.justInTime = 0; - } + if (this.switch_justInTime) { + this.justInTime = 1; + } else { + this.justInTime = 0; } + } } diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/EmailSenders.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/EmailSenders.ts index be2ef33c..563239b2 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/EmailSenders.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/EmailSenders.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { BaseEntity } from './BaseEntity'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/ExtraAttr.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/ExtraAttr.ts index aff70cb0..c1ef9ab8 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/ExtraAttr.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/ExtraAttr.ts @@ -19,9 +19,9 @@ import format from 'date-fns/format'; import { BaseEntity } from './BaseEntity'; export class ExtraAttr { - id!: string; - attr!: string; - type!: string; - value!: string; - constructor() { } + id!: string; + attr!: string; + type!: string; + value!: string; + constructor() {} } diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Institutions.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Institutions.ts index 9699784c..dc05512d 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Institutions.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Institutions.ts @@ -17,17 +17,17 @@ import { BaseEntity } from './BaseEntity'; export class Institutions extends BaseEntity { - name!: String; - fullName!: String; - contact!: String; - email!: String; - phone!: String; - address!: String; - logo!: String; - frontTitle!: String; - consoleTitle!: String; - consoleDomain!: String; - domain!: String; - captcha!: String; - defaultUri!: String; + name!: String; + fullName!: String; + contact!: String; + email!: String; + phone!: String; + address!: String; + logo!: String; + frontTitle!: String; + consoleTitle!: String; + consoleDomain!: String; + domain!: String; + captcha!: String; + defaultUri!: String; } diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/LdapContext.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/LdapContext.ts index beaa1d45..bca26b4a 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/LdapContext.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/LdapContext.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { BaseEntity } from './BaseEntity'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Message.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Message.ts index 92ca6f24..dec6ff57 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Message.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Message.ts @@ -1,25 +1,24 @@ /* * Copyright [2022] [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 format from 'date-fns/format'; import { NzSafeAny } from 'ng-zorro-antd/core/types'; export class Message { - code: number = 0; - message: string = ''; - data: any; + code: number = 0; + message: string = ''; + data: any; } diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Organizations.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Organizations.ts index 3d940f6f..6f32b82f 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Organizations.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Organizations.ts @@ -17,45 +17,45 @@ import { BaseEntity } from './BaseEntity'; export class Organizations extends BaseEntity { - orgCode!: String; - orgName!: String; - fullName!: String; - parentId!: String; - parentCode!: string; - parentName!: String; - type!: String; - codePath!: String; - namePath!: String; - level!: Number; - division!: String; - country!: String; - region!: String; - locality!: String; - street!: String; - address!: String; - contact!: String; - postalCode!: String; - phone!: String; - fax!: String; - email!: String; - switch_dynamic: boolean = false; + orgCode!: String; + orgName!: String; + fullName!: String; + parentId!: String; + parentCode!: string; + parentName!: String; + type!: String; + codePath!: String; + namePath!: String; + level!: Number; + division!: String; + country!: String; + region!: String; + locality!: String; + street!: String; + address!: String; + contact!: String; + postalCode!: String; + phone!: String; + fax!: String; + email!: String; + switch_dynamic: boolean = false; - constructor() { - super(); - this.status = 1; - } + constructor() { + super(); + this.status = 1; + } - override init(data: any): void { - Object.assign(this, data); - if (this.status == 1) { - this.switch_status = true; - } + override init(data: any): void { + Object.assign(this, data); + if (this.status == 1) { + this.switch_status = true; } - override trans(): void { - if (this.switch_status) { - this.status = 1; - } else { - this.status = 0; - } + } + override trans(): void { + if (this.switch_status) { + this.status = 1; + } else { + this.status = 0; } + } } diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/PageResults.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/PageResults.ts index bb8756e9..d5929bba 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/PageResults.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/PageResults.ts @@ -18,13 +18,13 @@ import format from 'date-fns/format'; import { NzSafeAny } from 'ng-zorro-antd/core/types'; export class PageResults { - page: number = 0; - total: number = 0; - totalPage: number = 0; - records: number = 0; - rows: any[] = []; + page: number = 0; + total: number = 0; + totalPage: number = 0; + records: number = 0; + rows: any[] = []; - init(data: any): void { - Object.assign(this, data); - } + init(data: any): void { + Object.assign(this, data); + } } diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/PasswordPolicy.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/PasswordPolicy.ts index 8cc0a345..7ffe4440 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/PasswordPolicy.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/PasswordPolicy.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { BaseEntity } from './BaseEntity'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Resources.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Resources.ts index a9e00236..1c5bf492 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Resources.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Resources.ts @@ -17,35 +17,35 @@ import { BaseEntity } from './BaseEntity'; export class Resources extends BaseEntity { - resourceName!: String; - permission!: String; - appId!: String; - appName!: String; - parentId!: String; - parentName!: String; - resourceType!: String; - resourceIcon!: String; - resourceStyle!: String; - resourceUrl!: String; - resourceAction!: String; - switch_dynamic: boolean = false; + resourceName!: String; + permission!: String; + appId!: String; + appName!: String; + parentId!: String; + parentName!: String; + resourceType!: String; + resourceIcon!: String; + resourceStyle!: String; + resourceUrl!: String; + resourceAction!: String; + switch_dynamic: boolean = false; - constructor() { - super(); - this.status = 1; - } + constructor() { + super(); + this.status = 1; + } - override init(data: any): void { - Object.assign(this, data); - if (this.status == 1) { - this.switch_status = true; - } + override init(data: any): void { + Object.assign(this, data); + if (this.status == 1) { + this.switch_status = true; } - override trans(): void { - if (this.switch_status) { - this.status = 1; - } else { - this.status = 0; - } + } + override trans(): void { + if (this.switch_status) { + this.status = 1; + } else { + this.status = 0; } + } } diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/RoleMembers.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/RoleMembers.ts index f8c87657..b9321b18 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/RoleMembers.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/RoleMembers.ts @@ -16,4 +16,4 @@ import { BaseEntity } from './BaseEntity'; -export class RoleMembers extends BaseEntity { } +export class RoleMembers extends BaseEntity {} diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Roles.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Roles.ts index c6ff53b0..1903d439 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Roles.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Roles.ts @@ -19,47 +19,47 @@ import format from 'date-fns/format'; import { BaseEntity } from './BaseEntity'; export class Roles extends BaseEntity { - roleCode!: String; - roleName!: String; - category!: String; - filters!: String; - orgIdsList!: String; - resumeTime!: String; - suspendTime!: String; - isdefault!: String; + roleCode!: String; + roleName!: String; + category!: String; + filters!: String; + orgIdsList!: String; + resumeTime!: String; + suspendTime!: String; + isdefault!: String; - picker_resumeTime: Date = new Date(format(new Date(), 'yyyy-MM-dd 00:00:00')); - picker_suspendTime: Date = new Date(format(new Date(), 'yyyy-MM-dd 00:00:00')); + picker_resumeTime: Date = new Date(format(new Date(), 'yyyy-MM-dd 00:00:00')); + picker_suspendTime: Date = new Date(format(new Date(), 'yyyy-MM-dd 00:00:00')); - constructor() { - super(); + constructor() { + super(); + } + + override init(data: any): void { + Object.assign(this, data); + if (this.status == 1) { + this.switch_status = true; } - override init(data: any): void { - Object.assign(this, data); - if (this.status == 1) { - this.switch_status = true; - } - - if (this.resumeTime != '') { - this.picker_resumeTime = new Date(format(new Date(), `yyyy-MM-dd ${this.resumeTime}:00`)); - } - if (this.suspendTime != '') { - this.picker_suspendTime = new Date(format(new Date(), `yyyy-MM-dd ${this.suspendTime}:00`)); - } + if (this.resumeTime != '') { + this.picker_resumeTime = new Date(format(new Date(), `yyyy-MM-dd ${this.resumeTime}:00`)); } - override trans(): void { - if (this.switch_status) { - this.status = 1; - } else { - this.status = 0; - } - - if (this.picker_resumeTime) { - this.resumeTime = format(this.picker_resumeTime, 'HH:mm'); - } - if (this.picker_suspendTime) { - this.suspendTime = format(this.picker_suspendTime, 'HH:mm'); - } + if (this.suspendTime != '') { + this.picker_suspendTime = new Date(format(new Date(), `yyyy-MM-dd ${this.suspendTime}:00`)); } + } + override trans(): void { + if (this.switch_status) { + this.status = 1; + } else { + this.status = 0; + } + + if (this.picker_resumeTime) { + this.resumeTime = format(this.picker_resumeTime, 'HH:mm'); + } + if (this.picker_suspendTime) { + this.suspendTime = format(this.picker_suspendTime, 'HH:mm'); + } + } } diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/SmsProvider.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/SmsProvider.ts index 452c5851..7cb73a39 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/SmsProvider.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/SmsProvider.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { BaseEntity } from './BaseEntity'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Synchronizers.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Synchronizers.ts index ba2eee28..27e58932 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Synchronizers.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Synchronizers.ts @@ -1,84 +1,83 @@ /* * Copyright [2022] [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 format from 'date-fns/format'; import { BaseEntity } from './BaseEntity'; export class Synchronizers extends BaseEntity { - name!: String; - filters!: String; - sourceType!: String; - service!: String; - resumeTime!: String; - suspendTime!: String; - scheduler!: String; - syncStartTime!: Number; - providerUrl!: String; - driverClass!: String; - principal!: String; - credentials!: String; - sslSwitch!: Number; - basedn!: String; - msadDomain!: String; - trustStore!: String; - trustStorePassword!: String; - switch_sslSwitch: boolean = false; - picker_resumeTime: Date = new Date(format(new Date(), 'yyyy-MM-dd 00:00:00')); - picker_suspendTime: Date = new Date(format(new Date(), 'yyyy-MM-dd 00:00:00')); + name!: String; + filters!: String; + sourceType!: String; + service!: String; + resumeTime!: String; + suspendTime!: String; + scheduler!: String; + syncStartTime!: Number; + providerUrl!: String; + driverClass!: String; + principal!: String; + credentials!: String; + sslSwitch!: Number; + basedn!: String; + msadDomain!: String; + trustStore!: String; + trustStorePassword!: String; + switch_sslSwitch: boolean = false; + picker_resumeTime: Date = new Date(format(new Date(), 'yyyy-MM-dd 00:00:00')); + picker_suspendTime: Date = new Date(format(new Date(), 'yyyy-MM-dd 00:00:00')); - constructor() { - super(); - this.status = 1; - this.sourceType != 'API'; - } + constructor() { + super(); + this.status = 1; + this.sourceType != 'API'; + } - override init(data: any): void { - Object.assign(this, data); - if (this.status == 1) { - this.switch_status = true; - } - if (this.sslSwitch == 1) { - this.switch_sslSwitch = true; - } - if (this.resumeTime != '') { - this.picker_resumeTime = new Date(format(new Date(), `yyyy-MM-dd ${this.resumeTime}:00`)); - } - if (this.suspendTime != '') { - this.picker_suspendTime = new Date(format(new Date(), `yyyy-MM-dd ${this.suspendTime}:00`)); - } + override init(data: any): void { + Object.assign(this, data); + if (this.status == 1) { + this.switch_status = true; } + if (this.sslSwitch == 1) { + this.switch_sslSwitch = true; + } + if (this.resumeTime != '') { + this.picker_resumeTime = new Date(format(new Date(), `yyyy-MM-dd ${this.resumeTime}:00`)); + } + if (this.suspendTime != '') { + this.picker_suspendTime = new Date(format(new Date(), `yyyy-MM-dd ${this.suspendTime}:00`)); + } + } - override trans(): void { - if (this.switch_status) { - this.status = 1; - } else { - this.status = 0; - } - if (this.switch_sslSwitch) { - this.sslSwitch = 1; - } else { - this.sslSwitch = 0; - } - if (this.picker_resumeTime) { - this.resumeTime = format(this.picker_resumeTime, 'HH:mm'); - } - if (this.picker_suspendTime) { - this.suspendTime = format(this.picker_suspendTime, 'HH:mm'); - } + override trans(): void { + if (this.switch_status) { + this.status = 1; + } else { + this.status = 0; } + if (this.switch_sslSwitch) { + this.sslSwitch = 1; + } else { + this.sslSwitch = 0; + } + if (this.picker_resumeTime) { + this.resumeTime = format(this.picker_resumeTime, 'HH:mm'); + } + if (this.picker_suspendTime) { + this.suspendTime = format(this.picker_suspendTime, 'HH:mm'); + } + } } diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/TreeNodes.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/TreeNodes.ts index f6dd5077..5e6f1f8d 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/TreeNodes.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/TreeNodes.ts @@ -16,48 +16,48 @@ import { NzFormatEmitEvent, NzTreeNode, NzTreeNodeOptions } from 'ng-zorro-antd/tree'; export class TreeNodes { - activated!: NzTreeNode; - request!: any[]; - nodes!: any[]; - checkable!: boolean; - checkedKeys!: any[]; - selectedKeys!: any[]; - _rootNode!: any; - constructor(checkable: boolean) { - this.checkable = checkable; - this.checkedKeys = []; - this.selectedKeys = []; - } + activated!: NzTreeNode; + request!: any[]; + nodes!: any[]; + checkable!: boolean; + checkedKeys!: any[]; + selectedKeys!: any[]; + _rootNode!: any; + constructor(checkable: boolean) { + this.checkable = checkable; + this.checkedKeys = []; + this.selectedKeys = []; + } - init(treeAttrs: any) { - let nodeType = treeAttrs.rootNode.attrs && treeAttrs.rootNode.attrs.type ? treeAttrs.rootNode.attrs.type : ''; - this._rootNode = { - title: treeAttrs.rootNode.title, - key: treeAttrs.rootNode.key, - type: nodeType, - expanded: true, - isLeaf: false - }; - this.request = treeAttrs.nodes; - } + init(treeAttrs: any) { + let nodeType = treeAttrs.rootNode.attrs && treeAttrs.rootNode.attrs.type ? treeAttrs.rootNode.attrs.type : ''; + this._rootNode = { + title: treeAttrs.rootNode.title, + key: treeAttrs.rootNode.key, + type: nodeType, + expanded: true, + isLeaf: false + }; + this.request = treeAttrs.nodes; + } - build(): any[] { - return this.buildTree(this._rootNode); - } + build(): any[] { + return this.buildTree(this._rootNode); + } - buildTree(rootNode: any): any[] { - let treeNodes: any[] = []; - for (let node of this.request) { - if (node.key != rootNode.key && node.parentKey == rootNode.key) { - let nodeType = node.attrs && node.attrs.type ? node.attrs.type : ''; - let treeNode = { title: node.title, key: node.key, type: nodeType, expanded: false, isLeaf: true }; - this.buildTree(treeNode); - treeNodes.push(treeNode); - //console.log(treeNode); - rootNode.isLeaf = false; - } - } - rootNode.children = treeNodes; - return [rootNode]; + buildTree(rootNode: any): any[] { + let treeNodes: any[] = []; + for (let node of this.request) { + if (node.key != rootNode.key && node.parentKey == rootNode.key) { + let nodeType = node.attrs && node.attrs.type ? node.attrs.type : ''; + let treeNode = { title: node.title, key: node.key, type: nodeType, expanded: false, isLeaf: true }; + this.buildTree(treeNode); + treeNodes.push(treeNode); + //console.log(treeNode); + rootNode.isLeaf = false; + } } + rootNode.children = treeNodes; + return [rootNode]; + } } diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Users.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Users.ts index 062de06b..8f1db9fd 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Users.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Users.ts @@ -17,173 +17,173 @@ import { BaseEntity } from './BaseEntity'; export class Users extends BaseEntity { - username!: String; - password!: String; - decipherable!: String; - sharedSecret!: String; - sharedCounter!: String; - /** - * "Employee", "Supplier","Dealer","Contractor",Partner,Customer "Intern", - * "Temp", "External", and "Unknown" . - */ - userType!: String; + username!: String; + password!: String; + decipherable!: String; + sharedSecret!: String; + sharedCounter!: String; + /** + * "Employee", "Supplier","Dealer","Contractor",Partner,Customer "Intern", + * "Temp", "External", and "Unknown" . + */ + userType!: String; - userState!: String; - windowsAccount!: String; + userState!: String; + windowsAccount!: String; - // for user name - displayName!: String; - nickName!: String; - nameZhSpell!: String; - nameZhShortSpell!: String; - givenName!: String; - middleName!: String; - familyName!: String; - honorificPrefix!: String; - honorificSuffix!: String; - formattedName!: String; + // for user name + displayName!: String; + nickName!: String; + nameZhSpell!: String; + nameZhShortSpell!: String; + givenName!: String; + middleName!: String; + familyName!: String; + honorificPrefix!: String; + honorificSuffix!: String; + formattedName!: String; - married!: Number; - gender!: Number; - birthDate!: String; - picture!: String; - pictureId!: String; - pictureBase64!: string; - idType!: Number; - idCardNo!: String; - webSite!: String; - startWorkDate!: String; + married!: Number; + gender!: Number; + birthDate!: String; + picture!: String; + pictureId!: String; + pictureBase64!: string; + idType!: Number; + idCardNo!: String; + webSite!: String; + startWorkDate!: String; - // for security - authnType!: String; - email!: String; - emailVerified!: Number; - mobile!: String; - mobileVerified!: String; - passwordQuestion!: String; - passwordAnswer!: String; + // for security + authnType!: String; + email!: String; + emailVerified!: Number; + mobile!: String; + mobileVerified!: String; + passwordQuestion!: String; + passwordAnswer!: String; - // for apps login protected - appLoginAuthnType!: String; - appLoginPassword!: String; - protectedApps!: String; - protectedAppsMap!: String; + // for apps login protected + appLoginAuthnType!: String; + appLoginPassword!: String; + protectedApps!: String; + protectedAppsMap!: String; - passwordLastSetTime!: String; - badPasswordCount!: Number; - badPasswordTime!: String; - unLockTime!: String; - isLocked!: Number; - lastLoginTime!: String; - lastLoginIp!: String; - lastLogoffTime!: String; - passwordSetType!: Number; - loginCount!: Number; - regionHistory!: String; - passwordHistory!: String; + passwordLastSetTime!: String; + badPasswordCount!: Number; + badPasswordTime!: String; + unLockTime!: String; + isLocked!: Number; + lastLoginTime!: String; + lastLoginIp!: String; + lastLogoffTime!: String; + passwordSetType!: Number; + loginCount!: Number; + regionHistory!: String; + passwordHistory!: String; - locale!: String; - timeZone!: String; - preferredLanguage!: String; + locale!: String; + timeZone!: String; + preferredLanguage!: String; - // for work - workCountry!: String; - workRegion!: String; // province; - workLocality!: String; // city; - workStreetAddress!: String; - workAddressFormatted!: String; - workEmail!: String; - workPhoneNumber!: String; - workPostalCode!: String; - workFax!: String; - workOfficeName!: String; - // for home - homeCountry!: String; - homeRegion!: String; // province; - homeLocality!: String; // city; - homeStreetAddress!: String; - homeAddressFormatted!: String; - homeEmail!: String; - homePhoneNumber!: String; - homePostalCode!: String; - homeFax!: String; - // for company - employeeNumber!: String; - costCenter!: String; - organization!: String; - division!: String; - departmentId!: String; - department!: String; - jobTitle!: String; - jobLevel!: String; - managerId!: String; - manager!: String; - assistantId!: String; - assistant!: String; - entryDate!: String; - quitDate!: String; + // for work + workCountry!: String; + workRegion!: String; // province; + workLocality!: String; // city; + workStreetAddress!: String; + workAddressFormatted!: String; + workEmail!: String; + workPhoneNumber!: String; + workPostalCode!: String; + workFax!: String; + workOfficeName!: String; + // for home + homeCountry!: String; + homeRegion!: String; // province; + homeLocality!: String; // city; + homeStreetAddress!: String; + homeAddressFormatted!: String; + homeEmail!: String; + homePhoneNumber!: String; + homePostalCode!: String; + homeFax!: String; + // for company + employeeNumber!: String; + costCenter!: String; + organization!: String; + division!: String; + departmentId!: String; + department!: String; + jobTitle!: String; + jobLevel!: String; + managerId!: String; + manager!: String; + assistantId!: String; + assistant!: String; + entryDate!: String; + quitDate!: String; - // for social contact - defineIm!: String; - theme!: String; - /* - * for extended Attribute from userType extraAttribute for database - * extraAttributeName & extraAttributeValue for page submit - */ - //protected String extraAttribute; - //protected String extraAttributeName; - //protected String extraAttributeValue; - //@JsonIgnore - //protected HashMap extraAttributeMap; + // for social contact + defineIm!: String; + theme!: String; + /* + * for extended Attribute from userType extraAttribute for database + * extraAttributeName & extraAttributeValue for page submit + */ + //protected String extraAttribute; + //protected String extraAttributeName; + //protected String extraAttributeValue; + //@JsonIgnore + //protected HashMap extraAttributeMap; - online!: Number; + online!: Number; - gridList!: Number; - switch_dynamic: boolean = false; + gridList!: Number; + switch_dynamic: boolean = false; - gender_select!: String; - str_married!: String; - str_idType!: String; - constructor() { - super(); - this.status = 1; - this.sortIndex = 1; - this.gender = 1; - this.userType = 'EMPLOYEE'; - this.userState = 'RESIDENT'; - this.gender_select = '1'; - this.str_married = '0'; - this.str_idType = '0'; + gender_select!: String; + str_married!: String; + str_idType!: String; + constructor() { + super(); + this.status = 1; + this.sortIndex = 1; + this.gender = 1; + this.userType = 'EMPLOYEE'; + this.userState = 'RESIDENT'; + this.gender_select = '1'; + this.str_married = '0'; + this.str_idType = '0'; + } + + override init(data: any): void { + Object.assign(this, data); + if (this.status == 1) { + this.switch_status = true; + } + if (this.gender == 1) { + this.gender_select = '1'; + } else { + this.gender_select = '2'; + } + this.str_status = `${this.status}`; + this.str_married = `${this.married}`; + this.str_idType = `${this.idType}`; + } + override trans(): void { + if (this.switch_status) { + this.status = 1; + } else { + this.status = 0; } - override init(data: any): void { - Object.assign(this, data); - if (this.status == 1) { - this.switch_status = true; - } - if (this.gender == 1) { - this.gender_select = '1'; - } else { - this.gender_select = '2'; - } - this.str_status = `${this.status}`; - this.str_married = `${this.married}`; - this.str_idType = `${this.idType}`; - } - override trans(): void { - if (this.switch_status) { - this.status = 1; - } else { - this.status = 0; - } - - if (this.gender_select == '1') { - this.gender = 1; - } else { - this.gender = 2; - } - this.status = Number.parseInt(`${this.str_status}`); - this.married = Number.parseInt(`${this.str_married}`); - this.idType = Number.parseInt(`${this.str_idType}`); + if (this.gender_select == '1') { + this.gender = 1; + } else { + this.gender = 2; } + this.status = Number.parseInt(`${this.str_status}`); + this.married = Number.parseInt(`${this.str_married}`); + this.idType = Number.parseInt(`${this.str_idType}`); + } } diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/global-config.module.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/global-config.module.ts index ec0a8399..f3bc932f 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/global-config.module.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/global-config.module.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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. */ - /* eslint-disable import/order */ import { ModuleWithProviders, NgModule, Optional, SkipSelf } from '@angular/core'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/basic.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/basic.component.ts index d181e66e..4045a868 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/basic.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/basic.component.ts @@ -154,5 +154,5 @@ export class LayoutBasicComponent implements OnInit { } } - constructor(private settingsService: SettingsService, private authnService: AuthnService) { } + constructor(private settingsService: SettingsService, private authnService: AuthnService) {} } diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/widgets/clear-storage.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/widgets/clear-storage.component.ts index 5ad9522f..a7ebbdab 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/widgets/clear-storage.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/widgets/clear-storage.component.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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, Component, HostListener } from '@angular/core'; import { NzMessageService } from 'ng-zorro-antd/message'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/widgets/fullscreen.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/widgets/fullscreen.component.ts index e4472c05..0919ead6 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/widgets/fullscreen.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/widgets/fullscreen.component.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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, Component, HostListener } from '@angular/core'; import screenfull from 'screenfull'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/widgets/i18n.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/widgets/i18n.component.ts index cbcc257e..243b1b3d 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/widgets/i18n.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/widgets/i18n.component.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { DOCUMENT } from '@angular/common'; import { ChangeDetectionStrategy, Component, Inject, Input } from '@angular/core'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/widgets/icon.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/widgets/icon.component.ts index ceb05ffe..2f39c7c8 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/widgets/icon.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/widgets/icon.component.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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, ChangeDetectorRef, Component } from '@angular/core'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/widgets/notify.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/widgets/notify.component.ts index 9fc645cf..aefcac55 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/widgets/notify.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/widgets/notify.component.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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, ChangeDetectorRef, Component } from '@angular/core'; import { NoticeIconList, NoticeIconSelect, NoticeItem } from '@delon/abc/notice-icon'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/widgets/rtl.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/widgets/rtl.component.ts index 5daec549..c9a1c016 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/widgets/rtl.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/widgets/rtl.component.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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, Component, HostListener } from '@angular/core'; import { RTLService } from '@delon/theme'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/widgets/search.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/widgets/search.component.ts index ed4f6e76..c7341a97 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/widgets/search.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/widgets/search.component.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { AfterViewInit, diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/widgets/task.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/widgets/task.component.ts index 91472058..986fe610 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/widgets/task.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/widgets/task.component.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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, ChangeDetectorRef, Component } from '@angular/core'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/widgets/user.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/widgets/user.component.ts index 0ec9a35a..b1f99dd1 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/widgets/user.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/widgets/user.component.ts @@ -81,7 +81,7 @@ export class HeaderUserComponent { private router: Router, private authnService: AuthnService, @Inject(DA_SERVICE_TOKEN) private tokenService: ITokenService - ) { } + ) {} logout(): void { this.authnService diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/blank/blank.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/blank/blank.component.ts index 39c378c3..20f8f4cd 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/blank/blank.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/blank/blank.component.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { Component } from '@angular/core'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/layout.module.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/layout.module.ts index 3e4722b6..d4cb92ee 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/layout.module.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/layout.module.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; @@ -23,7 +22,6 @@ import { GlobalFooterModule } from '@delon/abc/global-footer'; import { NoticeIconModule } from '@delon/abc/notice-icon'; import { AlainThemeModule } from '@delon/theme'; import { SettingDrawerModule } from '@delon/theme/setting-drawer'; - //import { ThemeBtnModule } from '@delon/theme/theme-btn'; import { NzAutocompleteModule } from 'ng-zorro-antd/auto-complete'; import { NzAvatarModule } from 'ng-zorro-antd/avatar'; @@ -94,4 +92,4 @@ const PASSPORT = [LayoutPassportComponent]; declarations: [...COMPONENTS, ...HEADERCOMPONENTS, ...PASSPORT], exports: [...COMPONENTS, ...PASSPORT] }) -export class LayoutModule { } +export class LayoutModule {} diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/passport/passport.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/passport/passport.component.html index f0db3303..0bb08df4 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/passport/passport.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/passport/passport.component.html @@ -36,4 +36,4 @@ - \ No newline at end of file + diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/passport/passport.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/passport/passport.component.ts index 39e65135..7b392456 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/passport/passport.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/passport/passport.component.ts @@ -40,7 +40,7 @@ export class LayoutPassportComponent implements OnInit { } ]; - constructor(@Inject(DA_SERVICE_TOKEN) private tokenService: ITokenService, private authnService: AuthnService) { } + constructor(@Inject(DA_SERVICE_TOKEN) private tokenService: ITokenService, private authnService: AuthnService) {} ngOnInit(): void { this.inst = this.authnService.getInst(); diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/access.module.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/access.module.ts index 81482ddc..2c9fe087 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/access.module.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/access.module.ts @@ -66,4 +66,4 @@ const COMPONENTS = [ imports: [NzIconModule, SharedModule, CommonModule, RouterModule.forChild(routes)], exports: [RouterModule] }) -export class AccessModule { } +export class AccessModule {} diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/permissions/permissions-editer/permissions-editer.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/permissions/permissions-editer/permissions-editer.component.html index 7927a851..65531105 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/permissions/permissions-editer/permissions-editer.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/permissions/permissions-editer/permissions-editer.component.html @@ -6,32 +6,47 @@ {{ 'mxk.apps.name' | i18n }} - +
- - + + + {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}
- + - + Id {{ 'mxk.apps.icon' | i18n }} {{ 'mxk.apps.name' | i18n }} @@ -40,8 +55,11 @@ - + {{ data.appName }} @@ -81,4 +99,4 @@
-
\ No newline at end of file + diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/permissions/permissions-editer/permissions-editer.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/permissions/permissions-editer/permissions-editer.component.ts index fb6355f5..857a27d8 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/permissions/permissions-editer/permissions-editer.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/permissions/permissions-editer/permissions-editer.component.ts @@ -59,30 +59,30 @@ export class PermissionsEditerComponent implements OnInit { indeterminate: boolean; checked: boolean; } = { - params: { - appName: '', - displayName: '', - username: '', - roleId: '', - startDate: '', - endDate: '', - startDatePicker: addDays(new Date(), -30), - endDatePicker: new Date(), - pageSize: 5, - pageNumber: 1, - pageSizeOptions: [5, 15, 50] - }, - results: { - records: 0, - rows: [] - }, - expandForm: false, - submitLoading: false, - tableLoading: false, - tableCheckedId: new Set(), - indeterminate: false, - checked: false - }; + params: { + appName: '', + displayName: '', + username: '', + roleId: '', + startDate: '', + endDate: '', + startDatePicker: addDays(new Date(), -30), + endDatePicker: new Date(), + pageSize: 5, + pageNumber: 1, + pageSizeOptions: [5, 15, 50] + }, + results: { + records: 0, + rows: [] + }, + expandForm: false, + submitLoading: false, + tableLoading: false, + tableCheckedId: new Set(), + indeterminate: false, + checked: false + }; constructor( private modalRef: NzModalRef, @@ -92,7 +92,7 @@ export class PermissionsEditerComponent implements OnInit { private msg: NzMessageService, @Inject(ALAIN_I18N_TOKEN) private i18n: I18NService, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { if (this.roleId) { @@ -111,7 +111,7 @@ export class PermissionsEditerComponent implements OnInit { this.fetch(); } - onReset(): void { } + onReset(): void {} fetch(): void { this.query.submitLoading = true; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/permissions/permissions.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/permissions/permissions.component.html index 87e8de2b..31362779 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/permissions/permissions.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/permissions/permissions.component.html @@ -8,12 +8,18 @@ {{ 'mxk.roles.name' | i18n }} - + - + @@ -22,18 +28,23 @@ {{ 'mxk.apps.name' | i18n }} - +
- - + + + {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}
@@ -44,30 +55,44 @@ + }}
- + - + Id {{ 'mxk.roles.name' | i18n }} {{ 'mxk.apps.icon' | i18n }} {{ 'mxk.apps.name' | i18n }} {{ 'mxk.apps.category' | i18n }} - {{ 'mxk.text.action' | i18n }} + {{ 'mxk.text.action' | i18n }} - + {{ data.roleName }} {{ data.appName }} @@ -103,8 +128,7 @@
- +
@@ -112,4 +136,4 @@
- \ No newline at end of file + diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/permissions/permissions.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/permissions/permissions.component.ts index 1db8d795..7dcb80c3 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/permissions/permissions.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/permissions/permissions.component.ts @@ -66,33 +66,33 @@ export class PermissionsComponent implements OnInit { indeterminate: boolean; checked: boolean; } = { - params: { - displayName: '', - username: '', - roleId: '', - roleName: '', - 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: '', + roleId: '', + roleName: '', + 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, @@ -104,7 +104,7 @@ export class PermissionsComponent implements OnInit { private route: ActivatedRoute, private cdr: ChangeDetectorRef, private http: _HttpClient - ) { } + ) {} ngOnInit(): void { if (this.route.snapshot.queryParams['roleId']) { @@ -126,7 +126,7 @@ export class PermissionsComponent implements OnInit { this.fetch(); } - onReset(): void { } + onReset(): void {} onBatchDelete(e: MouseEvent): void { e.preventDefault(); diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/member-roles-editer/member-roles-editer.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/member-roles-editer/member-roles-editer.component.html index 23d6b5aa..4ab808f7 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/member-roles-editer/member-roles-editer.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/member-roles-editer/member-roles-editer.component.html @@ -1,56 +1,74 @@
{{ 'mxk.text.add' | i18n }}
-
-
-
- - {{ 'mxk.roles.name' | i18n }} - - - - -
+ +
+
+ + {{ 'mxk.roles.name' | i18n }} + + + + +
-
- - - - -
-
- +
+ + + + +
+
+ - - - - - Id - {{ 'mxk.roles.name' | i18n }} - {{ 'mxk.roles.dynamic' | i18n }} - - - - - - - {{ data.id }} - - {{ data.roleName }} - - - - + + + + + Id + {{ 'mxk.roles.name' | i18n }} + {{ 'mxk.roles.dynamic' | i18n }} + + + + + + + {{ data.id }} + + {{ data.roleName }} + + + +
- - -
\ No newline at end of file + + + diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/member-roles-editer/member-roles-editer.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/member-roles-editer/member-roles-editer.component.ts index 7dd3b2b7..f737c8f5 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/member-roles-editer/member-roles-editer.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/member-roles-editer/member-roles-editer.component.ts @@ -57,29 +57,29 @@ export class MemberRolesEditerComponent implements OnInit { indeterminate: boolean; checked: boolean; } = { - params: { - roleName: '', - username: '', - protocol: '', - startDate: '', - endDate: '', - startDatePicker: addDays(new Date(), -30), - endDatePicker: new Date(), - pageSize: 5, - pageNumber: 1, - pageSizeOptions: [5, 15, 50] - }, - results: { - records: 0, - rows: [] - }, - expandForm: false, - submitLoading: false, - tableLoading: false, - tableCheckedId: new Set(), - indeterminate: false, - checked: false - }; + params: { + roleName: '', + username: '', + protocol: '', + startDate: '', + endDate: '', + startDatePicker: addDays(new Date(), -30), + endDatePicker: new Date(), + pageSize: 5, + pageNumber: 1, + pageSizeOptions: [5, 15, 50] + }, + results: { + records: 0, + rows: [] + }, + expandForm: false, + submitLoading: false, + tableLoading: false, + tableCheckedId: new Set(), + indeterminate: false, + checked: false + }; constructor( private modalRef: NzModalRef, @@ -89,7 +89,7 @@ export class MemberRolesEditerComponent implements OnInit { private msg: NzMessageService, @Inject(ALAIN_I18N_TOKEN) private i18n: I18NService, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { if (this.username) { @@ -108,7 +108,7 @@ export class MemberRolesEditerComponent implements OnInit { this.fetch(); } - onReset(): void { } + onReset(): void {} fetch(): void { this.query.submitLoading = true; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/role-members-editer/role-members-editer.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/role-members-editer/role-members-editer.component.html index f72e2e41..23e33fcb 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/role-members-editer/role-members-editer.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/role-members-editer/role-members-editer.component.html @@ -6,32 +6,47 @@ {{ 'mxk.users.username' | i18n }} - +
- - + + + {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}
- + - + Id {{ 'mxk.users.username' | i18n }} {{ 'mxk.users.displayName' | i18n }} @@ -43,17 +58,18 @@ - + {{ data.username }} {{ data.displayName }} {{ data.employeeNumber }} {{ 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) }} + @@ -61,4 +77,4 @@
-
\ No newline at end of file + diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/role-members-editer/role-members-editer.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/role-members-editer/role-members-editer.component.ts index ca3183ad..b4737fa0 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/role-members-editer/role-members-editer.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/role-members-editer/role-members-editer.component.ts @@ -60,30 +60,30 @@ export class RoleMembersEditerComponent implements OnInit { indeterminate: boolean; checked: boolean; } = { - params: { - name: '', - displayName: '', - username: '', - roleId: '', - startDate: '', - endDate: '', - startDatePicker: addDays(new Date(), -30), - endDatePicker: new Date(), - pageSize: 5, - pageNumber: 1, - pageSizeOptions: [5, 15, 50] - }, - results: { - records: 0, - rows: [] - }, - expandForm: false, - submitLoading: false, - tableLoading: false, - tableCheckedId: new Set(), - indeterminate: false, - checked: false - }; + params: { + name: '', + displayName: '', + username: '', + roleId: '', + startDate: '', + endDate: '', + startDatePicker: addDays(new Date(), -30), + endDatePicker: new Date(), + pageSize: 5, + pageNumber: 1, + pageSizeOptions: [5, 15, 50] + }, + results: { + records: 0, + rows: [] + }, + expandForm: false, + submitLoading: false, + tableLoading: false, + tableCheckedId: new Set(), + indeterminate: false, + checked: false + }; constructor( private modalRef: NzModalRef, @@ -93,7 +93,7 @@ export class RoleMembersEditerComponent implements OnInit { private msg: NzMessageService, @Inject(ALAIN_I18N_TOKEN) private i18n: I18NService, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { if (this.roleId) { @@ -112,7 +112,7 @@ export class RoleMembersEditerComponent implements OnInit { this.fetch(); } - onReset(): void { } + onReset(): void {} fetch(): void { this.query.submitLoading = true; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/role-members.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/role-members.component.html index 3b349296..98f1dc80 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/role-members.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/role-members.component.html @@ -8,12 +8,18 @@ {{ 'mxk.roles.name' | i18n }} - + - + @@ -22,17 +28,23 @@ {{ 'mxk.users.username' | i18n }} - +
- + + {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}
@@ -43,44 +55,56 @@ + }}
- + - + {{ 'mxk.roles.name' | i18n }} {{ 'mxk.users.username' | i18n }} {{ 'mxk.users.displayName' | i18n }} {{ 'mxk.users.department' | i18n }} {{ 'mxk.users.jobTitle' | i18n }} {{ 'mxk.users.gender' | i18n }} - {{ 'mxk.text.action' | i18n }} + {{ 'mxk.text.action' | i18n }} - + {{ data.roleName }} {{ 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) }}
- + }}
@@ -88,4 +112,4 @@
- \ No newline at end of file + diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/role-members.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/role-members.component.ts index f9ef1041..72740175 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/role-members.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/role-members.component.ts @@ -67,33 +67,33 @@ export class RoleMembersComponent implements OnInit { indeterminate: boolean; checked: boolean; } = { - params: { - roleName: '', - displayName: '', - username: '', - roleId: '', - 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: { + roleName: '', + displayName: '', + username: '', + roleId: '', + 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, @@ -104,7 +104,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']) { diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/roles/role-editer/role-editer.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/roles/role-editer/role-editer.component.html index 5e6bd8df..215b3d3b 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/roles/role-editer/role-editer.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/roles/role-editer/role-editer.component.html @@ -4,8 +4,7 @@ {{ 'mxk.text.id' | i18n }} - + @@ -17,8 +16,7 @@ {{ 'mxk.roles.name' | i18n }} - + @@ -33,40 +31,77 @@ {{ 'mxk.roles.resumeTime' | i18n }} - + {{ 'mxk.roles.suspendTime' | i18n }} - + {{ 'mxk.roles.orgIdsList' | i18n }} - - + + {{ 'mxk.roles.filters' | i18n }} - + {{ 'mxk.text.description' | i18n }} - + @@ -75,4 +110,4 @@
-
\ No newline at end of file + diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/roles/role-editer/role-editer.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/roles/role-editer/role-editer.component.ts index 2f277f41..893c5479 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/roles/role-editer/role-editer.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/roles/role-editer/role-editer.component.ts @@ -47,9 +47,9 @@ export class RoleEditerComponent implements OnInit { submitting: boolean; model: Roles; } = { - submitting: false, - model: new Roles() - }; + submitting: false, + model: new Roles() + }; // TreeNodes treeNodes = new TreeNodes(false); @@ -66,7 +66,7 @@ export class RoleEditerComponent implements OnInit { private msg: NzMessageService, @Inject(ALAIN_I18N_TOKEN) private i18n: I18NService, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { this.tree(); diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/roles/roles.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/roles/roles.component.html index 917021b5..a5d1344f 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/roles/roles.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/roles/roles.component.html @@ -7,19 +7,24 @@ {{ 'mxk.roles.name' | i18n }} - +
- - + + + {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}
@@ -29,27 +34,43 @@ + }} - + - + Id {{ 'mxk.roles.name' | i18n }} {{ 'mxk.roles.category' | i18n }} {{ 'mxk.text.description' | i18n }} - {{ 'mxk.text.action' | i18n }} + {{ 'mxk.text.action' | i18n }} - + {{ data.id }} @@ -61,20 +82,22 @@
- + - + }} + + nz-button + type="button" + (click)="onDelete($event, data.id)" + nzDanger + >{{ 'mxk.text.delete' | i18n }}
- \ No newline at end of file + diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/roles/roles.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/roles/roles.component.ts index 32f317e7..f126f1b1 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/roles/roles.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/roles/roles.component.ts @@ -59,29 +59,29 @@ export class RolesComponent implements OnInit { indeterminate: boolean; checked: boolean; } = { - params: { - roleName: '', - 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: { + roleName: '', + 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 RolesComponent implements OnInit { private router: Router, @Inject(ALAIN_I18N_TOKEN) private i18n: I18NService, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { this.fetch(); @@ -108,7 +108,7 @@ export class RolesComponent implements OnInit { this.fetch(); } - onReset(): void { } + onReset(): void {} onBatchDelete(e: MouseEvent): void { e.preventDefault(); diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/roles/select-roles/select-roles.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/roles/select-roles/select-roles.component.html index 79f193cf..d5736ef1 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/roles/select-roles/select-roles.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/roles/select-roles/select-roles.component.html @@ -6,28 +6,44 @@ {{ 'mxk.roles.name' | i18n }} - +
- - + + + {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}
- + @@ -38,8 +54,11 @@ - + {{ data.id }} @@ -53,4 +72,4 @@
-
\ No newline at end of file + diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/roles/select-roles/select-roles.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/roles/select-roles/select-roles.component.ts index 9039bffb..ecaf5e6e 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/roles/select-roles/select-roles.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/roles/select-roles/select-roles.component.ts @@ -55,29 +55,29 @@ export class SelectRolesComponent implements OnInit { indeterminate: boolean; checked: boolean; } = { - params: { - roleName: '', - displayName: '', - protocol: '', - startDate: '', - endDate: '', - startDatePicker: addDays(new Date(), -30), - endDatePicker: new Date(), - pageSize: 5, - pageNumber: 1, - pageSizeOptions: [5, 15, 50] - }, - results: { - records: 0, - rows: [] - }, - expandForm: false, - submitLoading: false, - tableLoading: false, - tableCheckedId: new Set(), - indeterminate: false, - checked: false - }; + params: { + roleName: '', + displayName: '', + protocol: '', + startDate: '', + endDate: '', + startDatePicker: addDays(new Date(), -30), + endDatePicker: new Date(), + pageSize: 5, + pageNumber: 1, + pageSizeOptions: [5, 15, 50] + }, + results: { + records: 0, + rows: [] + }, + expandForm: false, + submitLoading: false, + tableLoading: false, + tableCheckedId: new Set(), + indeterminate: false, + checked: false + }; constructor( private modalRef: NzModalRef, @@ -86,7 +86,7 @@ export class SelectRolesComponent implements OnInit { private fb: FormBuilder, private msg: NzMessageService, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { this.fetch(); @@ -102,7 +102,7 @@ export class SelectRolesComponent implements OnInit { this.fetch(); } - onReset(): void { } + onReset(): void {} fetch(): void { this.query.submitLoading = true; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/sessions/sessions.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/sessions/sessions.component.ts index 391dfe58..0a5902a8 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/sessions/sessions.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/sessions/sessions.component.ts @@ -56,29 +56,29 @@ export class SessionsComponent implements OnInit { indeterminate: boolean; checked: boolean; } = { - params: { - username: '', - 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: { + username: '', + 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 fb: FormBuilder, @@ -86,7 +86,7 @@ export class SessionsComponent implements OnInit { private msg: NzMessageService, @Inject(ALAIN_I18N_TOKEN) private i18n: I18NService, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { this.fetch(); @@ -102,7 +102,7 @@ export class SessionsComponent implements OnInit { this.fetch(); } - onReset(): void { } + onReset(): void {} onTerminate(e: MouseEvent): void { e.preventDefault(); diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/accounts/account-editer/account-editer.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/accounts/account-editer/account-editer.component.html index c951cbbb..f7765396 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/accounts/account-editer/account-editer.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/accounts/account-editer/account-editer.component.html @@ -4,105 +4,125 @@ {{ 'mxk.text.id' | i18n }} - + - {{ 'mxk.users.id' | i18n }} - + {{ 'mxk.users.id' | i18n }} - + - {{ 'mxk.users.displayName' | i18n }} - + {{ 'mxk.users.displayName' | i18n }} - + - + - {{ 'mxk.users.displayName' | i18n }} - + {{ 'mxk.users.displayName' | i18n }} - + - {{ 'mxk.users.username' | i18n }} - + {{ 'mxk.users.username' | i18n }} - + {{ 'mxk.apps.id' | i18n }} - + {{ 'mxk.apps.name' | i18n }} - + {{ 'mxk.apps.name' | i18n }} - + - + - {{ 'mxk.accounts.relatedUsername' | i18n - }} - + {{ 'mxk.accounts.relatedUsername' | i18n }} + - + - {{ 'mxk.accounts.relatedPassword' | i18n - }} - + {{ 'mxk.accounts.relatedPassword' | i18n }} + - + - + - + @@ -112,4 +132,4 @@
-
\ No newline at end of file + diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/accounts/account-editer/account-editer.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/accounts/account-editer/account-editer.component.ts index 4ea0144e..676185a6 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/accounts/account-editer/account-editer.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/accounts/account-editer/account-editer.component.ts @@ -51,9 +51,9 @@ export class AccountEditerComponent implements OnInit { submitting: boolean; model: Accounts; } = { - submitting: false, - model: new Accounts() - }; + submitting: false, + model: new Accounts() + }; formGroup: FormGroup = new FormGroup({}); @@ -67,7 +67,7 @@ export class AccountEditerComponent implements OnInit { private msg: NzMessageService, @Inject(ALAIN_I18N_TOKEN) private i18n: I18NService, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { if (this.isEdit) { 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 c7b7f145..628fb39f 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) }}
@@ -43,28 +55,43 @@ + }} - + - + Id {{ 'mxk.accounts.username' | i18n }} {{ 'mxk.accounts.displayName' | i18n }} {{ 'mxk.accounts.appName' | i18n }} {{ 'mxk.accounts.relatedUsername' | i18n }} - {{ 'mxk.text.action' | i18n }} + {{ 'mxk.text.action' | i18n }} - + {{ data.id }} @@ -75,11 +102,10 @@
- +
- \ No newline at end of file + 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 7a697f92..afafad4e 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 @@ -63,31 +63,31 @@ export class AccountsComponent implements OnInit { indeterminate: boolean; checked: boolean; } = { - params: { - username: '', - displayName: '', - employeeNumber: '', - appId: '', - appName: '', - 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: { + username: '', + displayName: '', + employeeNumber: '', + appId: '', + appName: '', + 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, @@ -98,7 +98,7 @@ export class AccountsComponent implements OnInit { @Inject(ALAIN_I18N_TOKEN) private i18n: I18NService, private route: ActivatedRoute, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { if (this.route.snapshot.queryParams['username']) { diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-basic-details-editer/app-basic-details-editer.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-basic-details-editer/app-basic-details-editer.component.html index 6c276081..211ef53a 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-basic-details-editer/app-basic-details-editer.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-basic-details-editer/app-basic-details-editer.component.html @@ -8,22 +8,24 @@ {{ 'mxk.text.id' | i18n }} - + - {{ 'mxk.apps.secret' | i18n }} - - + {{ 'mxk.apps.secret' | i18n }} + - + - + @@ -32,44 +34,57 @@ {{ 'mxk.apps.icon' | i18n }}
- +
Upload
- +
- - + +
- {{ 'mxk.apps.name' | i18n }} - + {{ 'mxk.apps.name' | i18n }} - + {{ 'mxk.apps.frequently' | i18n }} - - + + @@ -78,20 +93,15 @@
- {{ 'mxk.apps.protocol' | i18n }} - - - + {{ 'mxk.apps.protocol' | i18n }} + + {{ 'mxk.apps.category' | i18n }} - - + + @@ -126,33 +136,31 @@
- {{ 'mxk.apps.loginUrl' | i18n }} - - - + {{ 'mxk.apps.loginUrl' | i18n }} + +
- {{ 'mxk.text.status' | i18n }} - + {{ 'mxk.text.status' | i18n }} - + - {{ 'mxk.apps.isExtendAttr' | i18n }} - - - + {{ 'mxk.apps.isExtendAttr' | i18n }} + + @@ -164,18 +172,14 @@
{{ 'mxk.apps.logoutUrl' | i18n }} - - + + {{ 'mxk.apps.logoutType' | i18n }} - - + + @@ -187,10 +191,8 @@
{{ 'mxk.apps.visible' | i18n }} - - + + @@ -200,38 +202,30 @@ {{ 'mxk.text.sortIndex' | i18n }} - - + +
{{ 'mxk.apps.vendor' | i18n }} - - + + {{ 'mxk.apps.vendor.url' | i18n }} - - + +
{{ 'mxk.apps.isAdapter' | i18n }} - - + + @@ -239,32 +233,50 @@ {{ 'mxk.apps.adapter' | i18n }} - + - + - + - - + +
- {{ 'mxk.text.description' | i18n }} - - - + {{ 'mxk.text.description' | i18n }} + +
@@ -289,22 +301,24 @@ - + }} + - - - + + + + }} @@ -318,4 +332,4 @@
-
\ No newline at end of file +
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-basic-details-editer/app-basic-details-editer.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-basic-details-editer/app-basic-details-editer.component.ts index 8d2eeac0..8756de7b 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-basic-details-editer/app-basic-details-editer.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-basic-details-editer/app-basic-details-editer.component.ts @@ -60,9 +60,9 @@ export class AppBasicDetailsEditerComponent implements OnInit { submitting: boolean; model: Apps; } = { - submitting: false, - model: new Apps() - }; + submitting: false, + model: new Apps() + }; formGroup: FormGroup = new FormGroup({}); @@ -84,7 +84,7 @@ export class AppBasicDetailsEditerComponent implements OnInit { private msg: NzMessageService, @Inject(ALAIN_I18N_TOKEN) private i18n: I18NService, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { if (this.isEdit) { diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-cas-details-editer/app-cas-details-editer.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-cas-details-editer/app-cas-details-editer.component.html index 33273c40..37006139 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-cas-details-editer/app-cas-details-editer.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-cas-details-editer/app-cas-details-editer.component.html @@ -8,22 +8,24 @@ {{ 'mxk.text.id' | i18n }} - + - {{ 'mxk.apps.secret' | i18n }} - - + {{ 'mxk.apps.secret' | i18n }} + - + - + @@ -32,44 +34,57 @@ {{ 'mxk.apps.icon' | i18n }}
- +
Upload
- +
- - + +
- {{ 'mxk.apps.name' | i18n }} - + {{ 'mxk.apps.name' | i18n }} - + {{ 'mxk.apps.frequently' | i18n }} - - + + @@ -78,20 +93,15 @@
- {{ 'mxk.apps.protocol' | i18n }} - - - + {{ 'mxk.apps.protocol' | i18n }} + + {{ 'mxk.apps.category' | i18n }} - - + + @@ -126,33 +136,31 @@
- {{ 'mxk.apps.loginUrl' | i18n }} - - - + {{ 'mxk.apps.loginUrl' | i18n }} + +
- {{ 'mxk.text.status' | i18n }} - + {{ 'mxk.text.status' | i18n }} - + - {{ 'mxk.apps.isExtendAttr' | i18n }} - - - + {{ 'mxk.apps.isExtendAttr' | i18n }} + + @@ -163,34 +171,31 @@
- {{ 'mxk.apps.cas.service' | i18n }} - - - + {{ 'mxk.apps.cas.service' | i18n }} + +
- {{ 'mxk.apps.cas.callbackUrl' | i18n }} - - - + {{ 'mxk.apps.cas.callbackUrl' | i18n }} + +
- {{ 'mxk.apps.cas.casUser' | i18n }} - - - + {{ 'mxk.apps.cas.casUser' | i18n }} + + @@ -201,13 +206,10 @@ - {{ 'mxk.apps.cas.expires' | i18n }} - - + {{ 'mxk.apps.cas.expires' | i18n }} + - + @@ -217,18 +219,14 @@
{{ 'mxk.apps.logoutUrl' | i18n }} - - + + {{ 'mxk.apps.logoutType' | i18n }} - - + + @@ -240,10 +238,8 @@
{{ 'mxk.apps.visible' | i18n }} - - + + @@ -253,38 +249,30 @@ {{ 'mxk.text.sortIndex' | i18n }} - - + +
{{ 'mxk.apps.vendor' | i18n }} - - + + {{ 'mxk.apps.vendor.url' | i18n }} - - + +
{{ 'mxk.apps.isAdapter' | i18n }} - - + + @@ -292,31 +280,49 @@ {{ 'mxk.apps.adapter' | i18n }} - + - + - + - - + +
- {{ 'mxk.text.description' | i18n }} - - - + {{ 'mxk.text.description' | i18n }} + +
@@ -341,22 +347,24 @@ - + }} + - - - + + + + }} @@ -370,4 +378,4 @@
-
\ No newline at end of file +
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-cas-details-editer/app-cas-details-editer.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-cas-details-editer/app-cas-details-editer.component.ts index 615a92a6..54c326e0 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-cas-details-editer/app-cas-details-editer.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-cas-details-editer/app-cas-details-editer.component.ts @@ -60,9 +60,9 @@ export class AppCasDetailsEditerComponent implements OnInit { submitting: boolean; model: AppsCasDetails; } = { - submitting: false, - model: new AppsCasDetails() - }; + submitting: false, + model: new AppsCasDetails() + }; formGroup: FormGroup = new FormGroup({}); @@ -84,7 +84,7 @@ export class AppCasDetailsEditerComponent implements OnInit { private msg: NzMessageService, @Inject(ALAIN_I18N_TOKEN) private i18n: I18NService, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { if (this.isEdit) { diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-extend-api-details-editer/app-extend-api-details-editer.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-extend-api-details-editer/app-extend-api-details-editer.component.html index 4432cd91..e0cca5c0 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-extend-api-details-editer/app-extend-api-details-editer.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-extend-api-details-editer/app-extend-api-details-editer.component.html @@ -8,22 +8,24 @@ {{ 'mxk.text.id' | i18n }} - + - {{ 'mxk.apps.secret' | i18n }} - - + {{ 'mxk.apps.secret' | i18n }} + - + - + @@ -32,44 +34,57 @@ {{ 'mxk.apps.icon' | i18n }}
- +
Upload
- +
- - + +
- {{ 'mxk.apps.name' | i18n }} - + {{ 'mxk.apps.name' | i18n }} - + {{ 'mxk.apps.frequently' | i18n }} - - + + @@ -78,20 +93,15 @@
- {{ 'mxk.apps.protocol' | i18n }} - - - + {{ 'mxk.apps.protocol' | i18n }} + + {{ 'mxk.apps.category' | i18n }} - - + + @@ -126,33 +136,31 @@
- {{ 'mxk.apps.loginUrl' | i18n }} - - - + {{ 'mxk.apps.loginUrl' | i18n }} + +
- {{ 'mxk.text.status' | i18n }} - + {{ 'mxk.text.status' | i18n }} - + - {{ 'mxk.apps.isExtendAttr' | i18n }} - - - + {{ 'mxk.apps.isExtendAttr' | i18n }} + + @@ -163,21 +171,21 @@
- {{ 'mxk.apps.principal' | i18n }} - - - + {{ 'mxk.apps.principal' | i18n }} + + - {{ 'mxk.apps.credentials' | i18n }} - - - + {{ 'mxk.apps.credentials' | i18n }} + +
@@ -185,10 +193,8 @@
{{ 'mxk.apps.credential' | i18n }} - - + + @@ -198,12 +204,14 @@
- {{ 'mxk.apps.systemUserAttr' | i18n - }} - - + {{ 'mxk.apps.systemUserAttr' | i18n }} + + @@ -218,21 +226,29 @@ {{ 'mxk.apps.credential.sharedUsername' | i18n - }} - - + }} + + {{ 'mxk.apps.credential.sharedPassword' | i18n - }} - - + }} + +
@@ -241,18 +257,14 @@
{{ 'mxk.apps.logoutUrl' | i18n }} - - + + {{ 'mxk.apps.logoutType' | i18n }} - - + + @@ -264,10 +276,8 @@
{{ 'mxk.apps.visible' | i18n }} - - + + @@ -277,38 +287,30 @@ {{ 'mxk.text.sortIndex' | i18n }} - - + +
{{ 'mxk.apps.vendor' | i18n }} - - + + {{ 'mxk.apps.vendor.url' | i18n }} - - + +
{{ 'mxk.apps.isAdapter' | i18n }} - - + + @@ -316,31 +318,49 @@ {{ 'mxk.apps.adapter' | i18n }} - + - + - + - - + +
- {{ 'mxk.text.description' | i18n }} - - - + {{ 'mxk.text.description' | i18n }} + +
@@ -365,22 +385,24 @@ - + }} + - - - + + + + }} @@ -394,4 +416,4 @@
-
\ No newline at end of file +
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-form-based-details-editer/app-form-based-details-editer.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-form-based-details-editer/app-form-based-details-editer.component.html index 0a843500..244fdade 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-form-based-details-editer/app-form-based-details-editer.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-form-based-details-editer/app-form-based-details-editer.component.html @@ -8,22 +8,24 @@ {{ 'mxk.text.id' | i18n }} - + - {{ 'mxk.apps.secret' | i18n }} - - + {{ 'mxk.apps.secret' | i18n }} + - + - + @@ -32,44 +34,57 @@ {{ 'mxk.apps.icon' | i18n }}
- +
Upload
- +
- - + +
- {{ 'mxk.apps.name' | i18n }} - + {{ 'mxk.apps.name' | i18n }} - + {{ 'mxk.apps.frequently' | i18n }} - - + + @@ -78,20 +93,15 @@
- {{ 'mxk.apps.protocol' | i18n }} - - - + {{ 'mxk.apps.protocol' | i18n }} + + {{ 'mxk.apps.category' | i18n }} - - + + @@ -126,33 +136,31 @@
- {{ 'mxk.apps.loginUrl' | i18n }} - - - + {{ 'mxk.apps.loginUrl' | i18n }} + +
- {{ 'mxk.text.status' | i18n }} - + {{ 'mxk.text.status' | i18n }} - + - {{ 'mxk.apps.isExtendAttr' | i18n }} - - - + {{ 'mxk.apps.isExtendAttr' | i18n }} + + @@ -165,11 +173,15 @@ {{ 'mxk.apps.formbased.redirectUri' | i18n - }} - - + }} + +
@@ -177,42 +189,56 @@ {{ 'mxk.apps.formbased.usernameMapping' | i18n - }} - - + }} + + {{ 'mxk.apps.formbased.passwordMapping' | i18n - }} - - + }} + +
- {{ 'mxk.apps.formbased.authorizeView' | i18n }} - - - + {{ 'mxk.apps.formbased.authorizeView' | i18n }} + + {{ 'mxk.apps.formbased.passwordAlgorithm' | i18n - }} - - + }} + + @@ -234,10 +260,8 @@
{{ 'mxk.apps.credential' | i18n }} - - + + @@ -247,12 +271,14 @@
- {{ 'mxk.apps.systemUserAttr' | i18n - }} - - + {{ 'mxk.apps.systemUserAttr' | i18n }} + + @@ -267,21 +293,29 @@ {{ 'mxk.apps.credential.sharedUsername' | i18n - }} - - + }} + + {{ 'mxk.apps.credential.sharedPassword' | i18n - }} - - + }} + +
@@ -290,18 +324,14 @@
{{ 'mxk.apps.logoutUrl' | i18n }} - - + + {{ 'mxk.apps.logoutType' | i18n }} - - + + @@ -313,10 +343,8 @@
{{ 'mxk.apps.visible' | i18n }} - - + + @@ -326,38 +354,30 @@ {{ 'mxk.text.sortIndex' | i18n }} - - + +
{{ 'mxk.apps.vendor' | i18n }} - - + + {{ 'mxk.apps.vendor.url' | i18n }} - - + +
{{ 'mxk.apps.isAdapter' | i18n }} - - + + @@ -365,31 +385,49 @@ {{ 'mxk.apps.adapter' | i18n }} - + - + - + - - + +
- {{ 'mxk.text.description' | i18n }} - - - + {{ 'mxk.text.description' | i18n }} + +
@@ -414,22 +452,24 @@ - + }} + - - - + + + + }} @@ -443,4 +483,4 @@
-
\ No newline at end of file +
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-form-based-details-editer/app-form-based-details-editer.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-form-based-details-editer/app-form-based-details-editer.component.ts index f315e1a4..81aa798e 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-form-based-details-editer/app-form-based-details-editer.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-form-based-details-editer/app-form-based-details-editer.component.ts @@ -60,9 +60,9 @@ export class AppFormBasedDetailsEditerComponent implements OnInit { submitting: boolean; model: AppsFormBasedDetails; } = { - submitting: false, - model: new AppsFormBasedDetails() - }; + submitting: false, + model: new AppsFormBasedDetails() + }; formGroup: FormGroup = new FormGroup({}); @@ -85,7 +85,7 @@ export class AppFormBasedDetailsEditerComponent implements OnInit { private msg: NzMessageService, @Inject(ALAIN_I18N_TOKEN) private i18n: I18NService, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { if (this.isEdit) { diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-jwt-details-editer/app-jwt-details-editer.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-jwt-details-editer/app-jwt-details-editer.component.html index ea7b724f..fc73f1f5 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-jwt-details-editer/app-jwt-details-editer.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-jwt-details-editer/app-jwt-details-editer.component.html @@ -8,22 +8,24 @@ {{ 'mxk.text.id' | i18n }} - + - {{ 'mxk.apps.secret' | i18n }} - - + {{ 'mxk.apps.secret' | i18n }} + - + - + @@ -32,44 +34,57 @@ {{ 'mxk.apps.icon' | i18n }}
- +
Upload
- +
- - + +
- {{ 'mxk.apps.name' | i18n }} - + {{ 'mxk.apps.name' | i18n }} - + {{ 'mxk.apps.frequently' | i18n }} - - + + @@ -78,20 +93,15 @@
- {{ 'mxk.apps.protocol' | i18n }} - - - + {{ 'mxk.apps.protocol' | i18n }} + + {{ 'mxk.apps.category' | i18n }} - - + + @@ -126,33 +136,31 @@
- {{ 'mxk.apps.loginUrl' | i18n }} - - - + {{ 'mxk.apps.loginUrl' | i18n }} + +
- {{ 'mxk.text.status' | i18n }} - + {{ 'mxk.text.status' | i18n }} - + - {{ 'mxk.apps.isExtendAttr' | i18n }} - - - + {{ 'mxk.apps.isExtendAttr' | i18n }} + + @@ -163,23 +171,23 @@
- {{ 'mxk.apps.jwt.redirectUri' | i18n }} - - - + {{ 'mxk.apps.jwt.redirectUri' | i18n }} + +
- {{ 'mxk.apps.jwt.subject' | i18n }} - - - + {{ 'mxk.apps.jwt.subject' | i18n }} + + @@ -190,12 +198,9 @@ - {{ 'mxk.apps.jwt.tokenType' | i18n }} - - - + {{ 'mxk.apps.jwt.tokenType' | i18n }} + + @@ -205,22 +210,16 @@
- {{ 'mxk.apps.jwt.jwtName' | i18n }} - - - + {{ 'mxk.apps.jwt.jwtName' | i18n }} + + - {{ 'mxk.apps.jwt.expires' | i18n }} - - + {{ 'mxk.apps.jwt.expires' | i18n }} + - + @@ -228,29 +227,28 @@
{{ 'mxk.apps.jwt.issuer' | i18n }} - - + + {{ 'mxk.apps.jwt.audience' | i18n }} - - + +
- {{ 'mxk.apps.jwt.signature' | i18n }} - - - + {{ 'mxk.apps.jwt.signature' | i18n }} + + @@ -267,22 +265,29 @@ {{ 'mxk.apps.oauth.connect.signatureKey' | i18n - }} - - + }} + +
- {{ 'mxk.apps.oauth.connect.algorithm' | i18n }} - - - + {{ 'mxk.apps.oauth.connect.algorithm' | i18n }} + + @@ -299,11 +304,14 @@ {{ 'mxk.apps.oauth.connect.encryptionMethod' | i18n - }} - - + }} + + @@ -317,12 +325,15 @@
- {{ 'mxk.apps.oauth.connect.algorithmKey' | i18n - }} - - + {{ 'mxk.apps.oauth.connect.algorithmKey' | i18n }} + +
@@ -331,18 +342,14 @@
{{ 'mxk.apps.logoutUrl' | i18n }} - - + + {{ 'mxk.apps.logoutType' | i18n }} - - + + @@ -354,10 +361,8 @@
{{ 'mxk.apps.visible' | i18n }} - - + + @@ -367,38 +372,30 @@ {{ 'mxk.text.sortIndex' | i18n }} - - + +
{{ 'mxk.apps.vendor' | i18n }} - - + + {{ 'mxk.apps.vendor.url' | i18n }} - - + +
{{ 'mxk.apps.isAdapter' | i18n }} - - + + @@ -406,31 +403,49 @@ {{ 'mxk.apps.adapter' | i18n }} - + - + - + - - + +
- {{ 'mxk.text.description' | i18n }} - - - + {{ 'mxk.text.description' | i18n }} + +
@@ -455,22 +470,24 @@ - + }} + - - - + + + + }} @@ -484,4 +501,4 @@
-
\ No newline at end of file +
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-jwt-details-editer/app-jwt-details-editer.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-jwt-details-editer/app-jwt-details-editer.component.ts index a0e30fcb..e57b163c 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-jwt-details-editer/app-jwt-details-editer.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-jwt-details-editer/app-jwt-details-editer.component.ts @@ -61,9 +61,9 @@ export class AppJwtDetailsEditerComponent implements OnInit { submitting: boolean; model: AppsJwtDetails; } = { - submitting: false, - model: new AppsJwtDetails() - }; + submitting: false, + model: new AppsJwtDetails() + }; formGroup: FormGroup = new FormGroup({}); @@ -86,7 +86,7 @@ export class AppJwtDetailsEditerComponent implements OnInit { private msg: NzMessageService, @Inject(ALAIN_I18N_TOKEN) private i18n: I18NService, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { if (this.isEdit) { diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-oauth20-details-editer/app-oauth20-details-editer.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-oauth20-details-editer/app-oauth20-details-editer.component.html index 559219fd..0ded3a9a 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-oauth20-details-editer/app-oauth20-details-editer.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-oauth20-details-editer/app-oauth20-details-editer.component.html @@ -8,22 +8,24 @@ {{ 'mxk.text.id' | i18n }} - + - {{ 'mxk.apps.secret' | i18n }} - - + {{ 'mxk.apps.secret' | i18n }} + - + - + @@ -32,44 +34,57 @@ {{ 'mxk.apps.icon' | i18n }}
- +
Upload
- +
- - + +
- {{ 'mxk.apps.name' | i18n }} - + {{ 'mxk.apps.name' | i18n }} - + {{ 'mxk.apps.frequently' | i18n }} - - + + @@ -78,10 +93,8 @@
- {{ 'mxk.apps.protocol' | i18n }} - - + {{ 'mxk.apps.protocol' | i18n }} + @@ -91,10 +104,8 @@ {{ 'mxk.apps.category' | i18n }} - - + + @@ -129,33 +140,31 @@
- {{ 'mxk.apps.loginUrl' | i18n }} - - - + {{ 'mxk.apps.loginUrl' | i18n }} + +
- {{ 'mxk.text.status' | i18n }} - + {{ 'mxk.text.status' | i18n }} - + - {{ 'mxk.apps.isExtendAttr' | i18n }} - - - + {{ 'mxk.apps.isExtendAttr' | i18n }} + + @@ -168,22 +177,29 @@ {{ 'mxk.apps.oauth.registeredRedirectUris' | i18n - }} - - + }} + +
- {{ 'mxk.apps.oauth.GrantTypes' | i18n }} - - - + {{ 'mxk.apps.oauth.GrantTypes' | i18n }} + + @@ -197,12 +213,9 @@
- {{ 'mxk.apps.oauth.subject' | i18n }} - - - + {{ 'mxk.apps.oauth.subject' | i18n }} + + @@ -213,11 +226,14 @@ - {{ 'mxk.apps.oauth.scope' | i18n }} - + {{ 'mxk.apps.oauth.scope' | i18n }} - + @@ -235,12 +251,10 @@ {{ 'mxk.apps.oauth.approvalPrompt' | i18n - }} - + }} + - + @@ -251,8 +265,7 @@ PKCE - + @@ -264,24 +277,38 @@ {{ 'mxk.apps.oauth.accessTokenValiditySeconds' | i18n - }} - + }} + - + {{ 'mxk.apps.oauth.refreshTokenValiditySeconds' | i18n - }} - + }} + - + @@ -290,33 +317,30 @@
- {{ 'mxk.apps.oauth.connect.issuer' | i18n }} - - - + {{ 'mxk.apps.oauth.connect.issuer' | i18n }} + + - {{ 'mxk.apps.oauth.connect.audience' | i18n }} - - - + {{ 'mxk.apps.oauth.connect.audience' | i18n }} + +
- {{ 'mxk.apps.oauth.connect.signature' | i18n }} - - - + {{ 'mxk.apps.oauth.connect.signature' | i18n }} + + @@ -330,11 +354,14 @@ {{ 'mxk.apps.oauth.connect.userInfoResponse' | i18n - }} - - + }} + + @@ -345,23 +372,29 @@
- {{ 'mxk.apps.oauth.connect.signatureKey' | i18n - }} - - + {{ 'mxk.apps.oauth.connect.signatureKey' | i18n }} + +
- {{ 'mxk.apps.oauth.connect.algorithm' | i18n }} - - - + {{ 'mxk.apps.oauth.connect.algorithm' | i18n }} + + @@ -378,11 +411,14 @@ {{ 'mxk.apps.oauth.connect.encryptionMethod' | i18n - }} - - + }} + + @@ -396,12 +432,15 @@
- {{ 'mxk.apps.oauth.connect.algorithmKey' | i18n - }} - - + {{ 'mxk.apps.oauth.connect.algorithmKey' | i18n }} + +
@@ -410,18 +449,14 @@
{{ 'mxk.apps.logoutUrl' | i18n }} - - + + {{ 'mxk.apps.logoutType' | i18n }} - - + + @@ -433,10 +468,8 @@
{{ 'mxk.apps.visible' | i18n }} - - + + @@ -446,38 +479,30 @@ {{ 'mxk.text.sortIndex' | i18n }} - - + +
{{ 'mxk.apps.vendor' | i18n }} - - + + {{ 'mxk.apps.vendor.url' | i18n }} - - + +
{{ 'mxk.apps.isAdapter' | i18n }} - - + + @@ -485,31 +510,49 @@ {{ 'mxk.apps.adapter' | i18n }} - + - + - + - - + +
- {{ 'mxk.text.description' | i18n }} - - - + {{ 'mxk.text.description' | i18n }} + +
@@ -534,22 +577,24 @@ - + }} + - - - + + + + }} @@ -563,4 +608,4 @@
-
\ No newline at end of file +
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-oauth20-details-editer/app-oauth20-details-editer.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-oauth20-details-editer/app-oauth20-details-editer.component.ts index 3ceb0cbf..a0b7fc7b 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-oauth20-details-editer/app-oauth20-details-editer.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-oauth20-details-editer/app-oauth20-details-editer.component.ts @@ -60,9 +60,9 @@ export class AppOauth20DetailsEditerComponent implements OnInit { submitting: boolean; model: AppsOauth20Details; } = { - submitting: false, - model: new AppsOauth20Details() - }; + submitting: false, + model: new AppsOauth20Details() + }; formGroup: FormGroup = new FormGroup({}); @@ -85,7 +85,7 @@ export class AppOauth20DetailsEditerComponent implements OnInit { private msg: NzMessageService, @Inject(ALAIN_I18N_TOKEN) private i18n: I18NService, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { if (this.isEdit) { diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-saml20-details-editer/app-saml20-details-editer.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-saml20-details-editer/app-saml20-details-editer.component.ts index 2caf1bd4..e454a268 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-saml20-details-editer/app-saml20-details-editer.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-saml20-details-editer/app-saml20-details-editer.component.ts @@ -60,9 +60,9 @@ export class AppSaml20DetailsEditerComponent implements OnInit { submitting: boolean; model: AppsSamlDetails; } = { - submitting: false, - model: new AppsSamlDetails() - }; + submitting: false, + model: new AppsSamlDetails() + }; formGroup: FormGroup = new FormGroup({}); @@ -85,7 +85,7 @@ export class AppSaml20DetailsEditerComponent implements OnInit { private msg: NzMessageService, @Inject(ALAIN_I18N_TOKEN) private i18n: I18NService, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { if (this.isEdit) { diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-token-based-details-editer/app-token-based-details-editer.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-token-based-details-editer/app-token-based-details-editer.component.html index 01f269f1..26db36f7 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-token-based-details-editer/app-token-based-details-editer.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-token-based-details-editer/app-token-based-details-editer.component.html @@ -8,22 +8,24 @@ {{ 'mxk.text.id' | i18n }} - + - {{ 'mxk.apps.secret' | i18n }} - - + {{ 'mxk.apps.secret' | i18n }} + - + - + @@ -32,44 +34,57 @@ {{ 'mxk.apps.icon' | i18n }}
- +
Upload
- +
- - + +
- {{ 'mxk.apps.name' | i18n }} - + {{ 'mxk.apps.name' | i18n }} - + {{ 'mxk.apps.frequently' | i18n }} - - + + @@ -78,20 +93,15 @@
- {{ 'mxk.apps.protocol' | i18n }} - - - + {{ 'mxk.apps.protocol' | i18n }} + + {{ 'mxk.apps.category' | i18n }} - - + + @@ -126,33 +136,31 @@
- {{ 'mxk.apps.loginUrl' | i18n }} - - - + {{ 'mxk.apps.loginUrl' | i18n }} + +
- {{ 'mxk.text.status' | i18n }} - + {{ 'mxk.text.status' | i18n }} - + - {{ 'mxk.apps.isExtendAttr' | i18n }} - - - + {{ 'mxk.apps.isExtendAttr' | i18n }} + + @@ -163,23 +171,23 @@
- {{ 'mxk.apps.jwt.redirectUri' | i18n }} - - - + {{ 'mxk.apps.jwt.redirectUri' | i18n }} + +
- {{ 'mxk.apps.tokenbased.tokenType' | i18n - }} - - + {{ 'mxk.apps.tokenbased.tokenType' | i18n }} + + @@ -190,22 +198,29 @@ {{ 'mxk.apps.tokenbased.cookieName' | i18n - }} - - + }} + +
- {{ 'mxk.apps.tokenbased.algorithm' | i18n - }} - - + {{ 'mxk.apps.tokenbased.algorithm' | i18n }} + + @@ -215,13 +230,10 @@ - {{ 'mxk.apps.tokenbased.expires' | i18n }} - - + {{ 'mxk.apps.tokenbased.expires' | i18n }} + - + @@ -230,11 +242,15 @@ {{ 'mxk.apps.tokenbased.token.content' | i18n - }} - - + }} + + @@ -258,18 +274,14 @@
{{ 'mxk.apps.logoutUrl' | i18n }} - - + + {{ 'mxk.apps.logoutType' | i18n }} - - + + @@ -281,10 +293,8 @@
{{ 'mxk.apps.visible' | i18n }} - - + + @@ -294,38 +304,30 @@ {{ 'mxk.text.sortIndex' | i18n }} - - + +
{{ 'mxk.apps.vendor' | i18n }} - - + + {{ 'mxk.apps.vendor.url' | i18n }} - - + +
{{ 'mxk.apps.isAdapter' | i18n }} - - + + @@ -333,31 +335,49 @@ {{ 'mxk.apps.adapter' | i18n }} - + - + - + - - + +
- {{ 'mxk.text.description' | i18n }} - - - + {{ 'mxk.text.description' | i18n }} + +
@@ -382,22 +402,24 @@ - + }} + - - - + + + + }} @@ -411,4 +433,4 @@
-
\ No newline at end of file +
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-token-based-details-editer/app-token-based-details-editer.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-token-based-details-editer/app-token-based-details-editer.component.ts index e8f67751..903f826d 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-token-based-details-editer/app-token-based-details-editer.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-token-based-details-editer/app-token-based-details-editer.component.ts @@ -61,9 +61,9 @@ export class AppTokenBasedDetailsEditerComponent implements OnInit { submitting: boolean; model: AppsTokenBasedDetails; } = { - submitting: false, - model: new AppsTokenBasedDetails() - }; + submitting: false, + model: new AppsTokenBasedDetails() + }; formGroup: FormGroup = new FormGroup({}); @@ -86,7 +86,7 @@ export class AppTokenBasedDetailsEditerComponent implements OnInit { private msg: NzMessageService, @Inject(ALAIN_I18N_TOKEN) private i18n: I18NService, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { if (this.isEdit) { 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 37facc2f..a95d2d08 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 @@ -7,8 +7,14 @@ {{ 'mxk.apps.name' | i18n }} - +
@@ -34,12 +40,11 @@
- - + + + {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}
@@ -66,29 +71,45 @@ + }} - + - + Id {{ 'mxk.apps.icon' | i18n }} {{ 'mxk.apps.name' | i18n }} {{ 'mxk.apps.protocol' | i18n }} {{ 'mxk.apps.category' | i18n }} {{ 'mxk.text.status' | i18n }} - {{ 'mxk.text.action' | i18n }} + {{ 'mxk.text.action' | i18n }} - + {{ data.id }} @@ -126,22 +147,19 @@
{{ 'mxk.apps.category.1911' | i18n }}
{{ 'mxk.apps.category.1912' | i18n }}
- +
- + }} - + }} +
- \ No newline at end of file + diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/apps.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/apps.component.ts index 6e9ecd5b..b06599e5 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/apps.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/apps.component.ts @@ -66,29 +66,29 @@ export class AppsComponent implements OnInit { indeterminate: boolean; checked: boolean; } = { - params: { - appName: '', - displayName: '', - protocol: '', - 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: { + appName: '', + displayName: '', + protocol: '', + 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, @@ -99,7 +99,7 @@ export class AppsComponent implements OnInit { @Inject(ALAIN_I18N_TOKEN) private i18n: I18NService, private router: Router, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { this.fetch(); @@ -115,7 +115,7 @@ export class AppsComponent implements OnInit { this.fetch(); } - onReset(): void { } + onReset(): void {} onBatchDelete(e: MouseEvent): void { e.preventDefault(); diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/select-apps/select-apps.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/select-apps/select-apps.component.html index 42888c34..73f5c1b1 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/select-apps/select-apps.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/select-apps/select-apps.component.html @@ -6,28 +6,44 @@ {{ 'mxk.apps.name' | i18n }} - +
- - + + + {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}
- + @@ -39,8 +55,11 @@ - + {{ data.id }} @@ -84,4 +103,4 @@
-
\ No newline at end of file + diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/select-apps/select-apps.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/select-apps/select-apps.component.ts index fdca594d..e5d65759 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/select-apps/select-apps.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/select-apps/select-apps.component.ts @@ -56,29 +56,29 @@ export class SelectAppsComponent implements OnInit { indeterminate: boolean; checked: boolean; } = { - params: { - appName: '', - displayName: '', - protocol: '', - startDate: '', - endDate: '', - startDatePicker: addDays(new Date(), -30), - endDatePicker: new Date(), - pageSize: 5, - pageNumber: 1, - pageSizeOptions: [5, 15, 50] - }, - results: { - records: 0, - rows: [] - }, - expandForm: false, - submitLoading: false, - tableLoading: false, - tableCheckedId: new Set(), - indeterminate: false, - checked: false - }; + params: { + appName: '', + displayName: '', + protocol: '', + startDate: '', + endDate: '', + startDatePicker: addDays(new Date(), -30), + endDatePicker: new Date(), + pageSize: 5, + pageNumber: 1, + pageSizeOptions: [5, 15, 50] + }, + results: { + records: 0, + rows: [] + }, + expandForm: false, + submitLoading: false, + tableLoading: false, + tableCheckedId: new Set(), + indeterminate: false, + checked: false + }; constructor( private modalRef: NzModalRef, @@ -87,7 +87,7 @@ export class SelectAppsComponent implements OnInit { private fb: FormBuilder, private msg: NzMessageService, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { this.fetch(); @@ -103,7 +103,7 @@ export class SelectAppsComponent implements OnInit { this.fetch(); } - onReset(): void { } + onReset(): void {} fetch(): void { this.query.submitLoading = true; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-connector/audit-connector.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-connector/audit-connector.component.html index 75633241..15a8c3d4 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-connector/audit-connector.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-connector/audit-connector.component.html @@ -7,8 +7,7 @@ {{ 'mxk.history.connector.conName' | i18n }} - + @@ -16,8 +15,13 @@ {{ 'mxk.history.connector.sourceName' | i18n }} - + @@ -25,8 +29,13 @@ {{ 'mxk.users.employeeNumber' | i18n }} - + @@ -34,8 +43,14 @@ {{ 'mxk.text.startDate' | i18n }} - + @@ -44,29 +59,45 @@ {{ 'mxk.text.endDate' | i18n }} - +
- + + {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}
- + {{ 'mxk.history.connector.id' | i18n }} @@ -94,4 +125,4 @@ - \ No newline at end of file + diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-connector/audit-connector.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-connector/audit-connector.component.ts index 5272969a..995c1ddb 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-connector/audit-connector.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-connector/audit-connector.component.ts @@ -51,33 +51,33 @@ export class AuditConnectorComponent implements OnInit { submitLoading: boolean; tableLoading: boolean; } = { - params: { - conName: '', - sourceName: '', - 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 - }; + params: { + conName: '', + sourceName: '', + 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 + }; constructor( private fb: FormBuilder, private historyService: HistoryService, private msg: NzMessageService, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { this.fetch(); @@ -93,7 +93,7 @@ export class AuditConnectorComponent implements OnInit { this.fetch(); } - onReset(): void { } + onReset(): void {} fetch(): void { this.query.submitLoading = true; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-login-apps/audit-login-apps.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-login-apps/audit-login-apps.component.ts index 36016974..78c70634 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-login-apps/audit-login-apps.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-login-apps/audit-login-apps.component.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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, ChangeDetectorRef, Component, OnInit } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; @@ -51,26 +50,26 @@ export class AuditLoginAppsComponent implements OnInit { submitLoading: boolean; tableLoading: boolean; } = { - params: { - username: '', - 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 - }; + params: { + username: '', + 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 + }; constructor( private fb: FormBuilder, @@ -78,7 +77,7 @@ export class AuditLoginAppsComponent implements OnInit { private msg: NzMessageService, private cdr: ChangeDetectorRef, private http: _HttpClient - ) { } + ) {} ngOnInit(): void { this.fetch(); @@ -88,7 +87,7 @@ export class AuditLoginAppsComponent implements OnInit { this.fetch(); } - onReset(): void { } + onReset(): void {} onQueryParamsChange(tableQueryParams: NzTableQueryParams): void { this.query.params.pageNumber = tableQueryParams.pageIndex; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-logins/audit-logins.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-logins/audit-logins.component.html index ff8e6858..cd2178be 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-logins/audit-logins.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-logins/audit-logins.component.html @@ -7,8 +7,7 @@ {{ 'mxk.users.username' | i18n }} - + @@ -16,8 +15,13 @@ {{ 'mxk.users.displayName' | i18n }} - + @@ -25,8 +29,13 @@ {{ 'mxk.users.employeeNumber' | i18n }} - + @@ -34,8 +43,14 @@ {{ 'mxk.text.startDate' | i18n }} - + @@ -44,29 +59,45 @@ {{ 'mxk.text.endDate' | i18n }} - +
- + + {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}
- + {{ 'mxk.history.login.sessionId' | i18n }} @@ -98,4 +129,4 @@ - \ No newline at end of file + diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-logins/audit-logins.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-logins/audit-logins.component.ts index a41d404d..648e70d1 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-logins/audit-logins.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-logins/audit-logins.component.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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, ChangeDetectorRef, Component, OnInit } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; @@ -52,33 +51,33 @@ export class AuditLoginsComponent implements OnInit { submitLoading: boolean; tableLoading: boolean; } = { - params: { - username: '', - 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 - }; + params: { + username: '', + 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 + }; constructor( private fb: FormBuilder, private historyService: HistoryService, private msg: NzMessageService, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { this.fetch(); @@ -88,7 +87,7 @@ export class AuditLoginsComponent implements OnInit { this.fetch(); } - onReset(): void { } + onReset(): void {} onQueryParamsChange(tableQueryParams: NzTableQueryParams): void { this.query.params.pageNumber = tableQueryParams.pageIndex; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-synchronizer/audit-synchronizer.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-synchronizer/audit-synchronizer.component.html index f5bb1763..ff26cb63 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-synchronizer/audit-synchronizer.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-synchronizer/audit-synchronizer.component.html @@ -7,8 +7,7 @@ {{ 'mxk.history.synchronizer.syncName' | i18n }} - + @@ -16,8 +15,13 @@ {{ 'mxk.history.synchronizer.objectName' | i18n }} - + @@ -25,8 +29,13 @@ {{ 'mxk.users.employeeNumber' | i18n }} - + @@ -34,8 +43,14 @@ {{ 'mxk.text.startDate' | i18n }} - + @@ -44,29 +59,45 @@ {{ 'mxk.text.endDate' | i18n }} - +
- + + {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}
- + {{ 'mxk.history.synchronizer.syncId' | i18n }} @@ -92,4 +123,4 @@ - \ No newline at end of file + diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-synchronizer/audit-synchronizer.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-synchronizer/audit-synchronizer.component.ts index 88a477d8..0a4db898 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-synchronizer/audit-synchronizer.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-synchronizer/audit-synchronizer.component.ts @@ -51,33 +51,33 @@ export class AuditSynchronizerComponent implements OnInit { submitLoading: boolean; tableLoading: boolean; } = { - params: { - syncName: '', - objectName: '', - 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 - }; + params: { + syncName: '', + objectName: '', + 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 + }; constructor( private fb: FormBuilder, private historyService: HistoryService, private msg: NzMessageService, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { this.fetch(); @@ -93,7 +93,7 @@ export class AuditSynchronizerComponent implements OnInit { this.fetch(); } - onReset(): void { } + onReset(): void {} fetch(): void { this.query.submitLoading = true; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-system-logs/audit-system-logs.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-system-logs/audit-system-logs.component.html index 15f232c6..803df8bc 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-system-logs/audit-system-logs.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-system-logs/audit-system-logs.component.html @@ -7,8 +7,7 @@ {{ 'mxk.users.username' | i18n }} - + @@ -16,8 +15,13 @@ {{ 'mxk.users.displayName' | i18n }} - + @@ -25,8 +29,13 @@ {{ 'mxk.users.employeeNumber' | i18n }} - + @@ -34,8 +43,14 @@ {{ 'mxk.text.startDate' | i18n }} - + @@ -44,29 +59,45 @@ {{ 'mxk.text.endDate' | i18n }} - +
- + + {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}
- + {{ 'mxk.history.systemlogs.id' | i18n }} @@ -92,4 +123,4 @@ - \ No newline at end of file + diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-system-logs/audit-system-logs.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-system-logs/audit-system-logs.component.ts index 8436d152..2520261b 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-system-logs/audit-system-logs.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit-system-logs/audit-system-logs.component.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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, ChangeDetectorRef, Component, OnInit } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; @@ -52,33 +51,33 @@ export class AuditSystemLogsComponent implements OnInit { submitLoading: boolean; tableLoading: boolean; } = { - params: { - username: '', - 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 - }; + params: { + username: '', + 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 + }; constructor( private fb: FormBuilder, private historyService: HistoryService, private msg: NzMessageService, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { this.fetch(); @@ -88,7 +87,7 @@ export class AuditSystemLogsComponent implements OnInit { this.fetch(); } - onReset(): void { } + onReset(): void {} onQueryParamsChange(tableQueryParams: NzTableQueryParams): void { this.query.params.pageNumber = tableQueryParams.pageIndex; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit.module.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit.module.ts index d2179aed..1371100b 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit.module.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/audit/audit.module.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/accounts-strategy/accounts-strategy-editer/accounts-strategy-editer.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/accounts-strategy/accounts-strategy-editer/accounts-strategy-editer.component.html index 35e8a69e..d1843437 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/accounts-strategy/accounts-strategy-editer/accounts-strategy-editer.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/accounts-strategy/accounts-strategy-editer/accounts-strategy-editer.component.html @@ -4,35 +4,37 @@ {{ 'mxk.text.id' | i18n }} - + - {{ 'mxk.accountsstrategy.name' | i18n }} - + {{ 'mxk.accountsstrategy.name' | i18n }} - {{ 'mxk.accountsstrategy.appName' | i18n }} - + {{ 'mxk.accountsstrategy.appName' | i18n }} - + - + - {{ 'mxk.accountsstrategy.mapping' | i18n }} - + {{ 'mxk.accountsstrategy.mapping' | i18n }} @@ -45,39 +47,54 @@ - {{ 'mxk.accountsstrategy.suffixes' | i18n }} - + {{ 'mxk.accountsstrategy.suffixes' | i18n }} - + - {{ 'mxk.accountsstrategy.orgIdsList' | i18n }} - + {{ 'mxk.accountsstrategy.orgIdsList' | i18n }} - - + + {{ 'mxk.accountsstrategy.filters' | i18n }} - + - {{ 'mxk.accountsstrategy.createType' | i18n }} - + {{ 'mxk.accountsstrategy.createType' | i18n }} - + @@ -86,15 +103,27 @@ {{ 'mxk.text.description' | i18n }} - + {{ 'mxk.text.status' | i18n }} - + @@ -105,4 +134,4 @@
-
\ No newline at end of file + diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/accounts-strategy/accounts-strategy-editer/accounts-strategy-editer.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/accounts-strategy/accounts-strategy-editer/accounts-strategy-editer.component.ts index 2bce7a9e..44125c8a 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/accounts-strategy/accounts-strategy-editer/accounts-strategy-editer.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/accounts-strategy/accounts-strategy-editer/accounts-strategy-editer.component.ts @@ -48,9 +48,9 @@ export class AccountsStrategyEditerComponent implements OnInit { submitting: boolean; model: AccountsStrategy; } = { - submitting: false, - model: new AccountsStrategy() - }; + submitting: false, + model: new AccountsStrategy() + }; formGroup: FormGroup = new FormGroup({}); // TreeNodes @@ -68,7 +68,7 @@ export class AccountsStrategyEditerComponent implements OnInit { private msg: NzMessageService, @Inject(ALAIN_I18N_TOKEN) private i18n: I18NService, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { this.tree(); 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 c5d08463..c27d8a64 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 @@ -7,19 +7,17 @@ {{ 'mxk.accountsstrategy.name' | i18n }} - +
- - + + + {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}
@@ -29,48 +27,60 @@ + }} - + - + Id {{ 'mxk.accountsstrategy.name' | i18n }} {{ 'mxk.accountsstrategy.appIcon' | i18n }} {{ 'mxk.accountsstrategy.appName' | i18n }} {{ 'mxk.accountsstrategy.createType' | i18n }} {{ 'mxk.text.status' | i18n }} - {{ 'mxk.text.action' | i18n }} + {{ 'mxk.text.action' | i18n }} - + {{ data.id }} {{ data.name }} {{ data.appName }} - {{ data.createType == 'manual' ? ('mxk.text.manual' | i18n) : ('mxk.text.manual' | i18n) }} - - + {{ data.createType == 'manual' ? ('mxk.text.manual' | i18n) : ('mxk.text.manual' | i18n) }} +
- - + +
- \ No newline at end of file + 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 b20bed3b..6c1dba41 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 @@ -58,29 +58,29 @@ export class AccountsStrategyComponent implements OnInit { indeterminate: boolean; checked: boolean; } = { - params: { - name: '', - displayName: '', - protocol: '', - 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: { + name: '', + displayName: '', + protocol: '', + 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, @@ -90,7 +90,7 @@ export class AccountsStrategyComponent implements OnInit { private msg: NzMessageService, @Inject(ALAIN_I18N_TOKEN) private i18n: I18NService, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { this.fetch(); @@ -106,7 +106,7 @@ export class AccountsStrategyComponent implements OnInit { this.fetch(); } - onReset(): void { } + onReset(): void {} onBatchDelete(e: MouseEvent): void { e.preventDefault(); diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/accounts-strategy/select-accounts-strategy/select-accounts-strategy.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/accounts-strategy/select-accounts-strategy/select-accounts-strategy.component.ts index 6888c1a6..5ccdc6e1 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/accounts-strategy/select-accounts-strategy/select-accounts-strategy.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/accounts-strategy/select-accounts-strategy/select-accounts-strategy.component.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; @@ -56,29 +55,29 @@ export class SelectAccountsStrategyComponent implements OnInit { indeterminate: boolean; checked: boolean; } = { - params: { - name: '', - displayName: '', - protocol: '', - 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: { + name: '', + displayName: '', + protocol: '', + 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 modalRef: NzModalRef, @@ -88,7 +87,7 @@ export class SelectAccountsStrategyComponent implements OnInit { private fb: FormBuilder, private msg: NzMessageService, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { this.fetch(); @@ -104,7 +103,7 @@ export class SelectAccountsStrategyComponent implements OnInit { this.fetch(); } - onReset(): void { } + onReset(): void {} fetch(): void { this.query.submitLoading = true; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/adapters/adapter-editer/adapter-editer.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/adapters/adapter-editer/adapter-editer.component.html index 009dd647..36800584 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/adapters/adapter-editer/adapter-editer.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/adapters/adapter-editer/adapter-editer.component.html @@ -4,30 +4,41 @@ {{ 'mxk.text.id' | i18n }} - + - {{ 'mxk.adapters.name' | i18n }} - + {{ 'mxk.adapters.name' | i18n }} - {{ 'mxk.adapters.adapter' | i18n }} - + {{ 'mxk.adapters.adapter' | i18n }} - + {{ 'mxk.text.description' | i18n }} - + @@ -36,4 +47,4 @@
-
\ No newline at end of file + diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/adapters/adapter-editer/adapter-editer.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/adapters/adapter-editer/adapter-editer.component.ts index 674d9af5..5fe23b01 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/adapters/adapter-editer/adapter-editer.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/adapters/adapter-editer/adapter-editer.component.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { Component, ChangeDetectorRef, Input, OnInit } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; @@ -45,9 +44,9 @@ export class AdapterEditerComponent implements OnInit { submitting: boolean; model: Adapters; } = { - submitting: false, - model: new Adapters() - }; + submitting: false, + model: new Adapters() + }; formGroup: FormGroup = new FormGroup({}); @@ -57,7 +56,7 @@ export class AdapterEditerComponent implements OnInit { private fb: FormBuilder, private msg: NzMessageService, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { if (this.isEdit) { 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 5fc0ae04..3c397b55 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 @@ -7,19 +7,17 @@ {{ 'mxk.adapters.name' | i18n }} - +
- - + + + {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}
@@ -29,28 +27,44 @@ + }} - + - + Id {{ 'mxk.adapters.name' | i18n }} {{ 'mxk.adapters.protocol' | i18n }} {{ 'mxk.text.sortIndex' | i18n }} {{ 'mxk.text.description' | i18n }} - {{ 'mxk.text.action' | i18n }} + {{ 'mxk.text.action' | i18n }} - + {{ data.id }} @@ -60,13 +74,11 @@ {{ data.description }}
- - + +
- \ No newline at end of file + 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 3e8eafb4..8ec1ed7c 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 @@ -58,29 +58,29 @@ export class AdaptersComponent implements OnInit { indeterminate: boolean; checked: boolean; } = { - params: { - name: '', - 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: { + name: '', + 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 modal: NzModalService, @@ -90,7 +90,7 @@ export class AdaptersComponent implements OnInit { private msg: NzMessageService, @Inject(ALAIN_I18N_TOKEN) private i18n: I18NService, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { this.fetch(); @@ -106,7 +106,7 @@ export class AdaptersComponent implements OnInit { this.fetch(); } - onReset(): void { } + onReset(): void {} onBatchDelete(e: MouseEvent): void { e.preventDefault(); diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/adapters/select-adapters/select-adapters.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/adapters/select-adapters/select-adapters.component.ts index 2659c24b..bcfedf44 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/adapters/select-adapters/select-adapters.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/adapters/select-adapters/select-adapters.component.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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, Input, ViewContainerRef, ChangeDetectorRef, Component, OnInit } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; @@ -59,29 +58,29 @@ export class SelectAdaptersComponent implements OnInit { indeterminate: boolean; checked: boolean; } = { - params: { - name: '', - displayName: '', - protocol: '', - startDate: '', - endDate: '', - startDatePicker: addDays(new Date(), -30), - endDatePicker: new Date(), - pageSize: 5, - pageNumber: 1, - pageSizeOptions: [5, 15, 50] - }, - results: { - records: 0, - rows: [] - }, - expandForm: false, - submitLoading: false, - tableLoading: false, - tableCheckedId: new Set(), - indeterminate: false, - checked: false - }; + params: { + name: '', + displayName: '', + protocol: '', + startDate: '', + endDate: '', + startDatePicker: addDays(new Date(), -30), + endDatePicker: new Date(), + pageSize: 5, + pageNumber: 1, + pageSizeOptions: [5, 15, 50] + }, + results: { + records: 0, + rows: [] + }, + expandForm: false, + submitLoading: false, + tableLoading: false, + tableCheckedId: new Set(), + indeterminate: false, + checked: false + }; constructor( private modalRef: NzModalRef, @@ -90,7 +89,7 @@ export class SelectAdaptersComponent implements OnInit { private fb: FormBuilder, private msg: NzMessageService, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { if (this.protocol) { @@ -109,7 +108,7 @@ export class SelectAdaptersComponent implements OnInit { this.fetch(); } - onReset(): void { } + onReset(): void {} fetch(): void { this.query.submitLoading = true; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/config.module.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/config.module.ts index bb0c1db3..6d65d37b 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/config.module.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/config.module.ts @@ -120,4 +120,4 @@ const COMPONENTS = [PasswordPolicyComponent, EmailSendersComponent, LdapContextC imports: [SharedModule, CommonModule, RouterModule.forChild(routes)], exports: [RouterModule] }) -export class ConfigModule { } +export class ConfigModule {} diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/connectors/connector-editer/connector-editer.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/connectors/connector-editer/connector-editer.component.html index d8bfde75..ff0e4ce6 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/connectors/connector-editer/connector-editer.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/connectors/connector-editer/connector-editer.component.html @@ -1,81 +1,89 @@
{{ isEdit ? ('mxk.text.edit' | i18n) : ('mxk.text.add' | i18n) }}
-
- - {{ 'mxk.text.id' | i18n }} - - - - - - {{ 'mxk.connectors.connName' | i18n }} - - - - - - {{ 'mxk.connectors.justInTime' | i18n }} - - - - - - - - - - {{ 'mxk.connectors.scheduler' | i18n }} - - - - - - - {{ 'mxk.connectors.providerUrl' | i18n - }} - - - - - - {{ 'mxk.connectors.principal' | i18n }} - - - - - - - {{ 'mxk.connectors.credentials' | i18n - }} - - - - - - {{ 'mxk.text.status' | i18n }} - - - - - - - -
+
+ + {{ 'mxk.text.id' | i18n }} + + + + + + {{ 'mxk.connectors.connName' | i18n }} + + + + + + {{ 'mxk.connectors.justInTime' | i18n }} + + + + + + + + + {{ 'mxk.connectors.scheduler' | i18n }} + + + + + + {{ 'mxk.connectors.providerUrl' | i18n }} + + + + + + {{ 'mxk.connectors.principal' | i18n }} + + + + + + {{ 'mxk.connectors.credentials' | i18n }} + + + + + + {{ 'mxk.text.status' | i18n }} + + + + + + +
- - -
\ No newline at end of file + + + diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/connectors/connector-editer/connector-editer.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/connectors/connector-editer/connector-editer.component.ts index 974572a6..4816d954 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/connectors/connector-editer/connector-editer.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/connectors/connector-editer/connector-editer.component.ts @@ -44,9 +44,9 @@ export class ConnectorEditerComponent implements OnInit { submitting: boolean; model: Connectors; } = { - submitting: false, - model: new Connectors() - }; + submitting: false, + model: new Connectors() + }; formGroup: FormGroup = new FormGroup({}); @@ -57,7 +57,7 @@ export class ConnectorEditerComponent implements OnInit { private msg: NzMessageService, @Inject(ALAIN_I18N_TOKEN) private i18n: I18NService, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { if (this.isEdit) { 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 01bea2b2..d59c3503 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 @@ -1,75 +1,91 @@ -
-
-
- - {{ 'mxk.connectors.connName' | i18n }} - - - - -
+ +
+
+ + {{ 'mxk.connectors.connName' | i18n }} + + + + +
-
- - - -
-
- +
+ + + +
+
+
-
- - -
- - - - - Id - {{ 'mxk.connectors.connName' | i18n }} - {{ 'mxk.connectors.justInTime' | i18n }} - {{ 'mxk.text.status' | i18n }} - {{ 'mxk.text.action' | i18n }} - - - - - - - {{ data.id }} - +
+ + +
+ + + + + Id + {{ 'mxk.connectors.connName' | i18n }} + {{ 'mxk.connectors.justInTime' | i18n }} + {{ 'mxk.text.status' | i18n }} + {{ 'mxk.text.action' | i18n }} + + + + + + + {{ data.id }} + - {{ data.connName }} - {{ 'mxk.text.yes' | i18n }} - {{ 'mxk.text.no' | i18n }} - - -
- - -
- - - -
-
\ No newline at end of file + {{ 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 b4e5e350..6f1e3cc8 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 @@ -42,29 +42,29 @@ export class ConnectorsComponent implements OnInit { indeterminate: boolean; checked: boolean; } = { - params: { - connName: '', - displayName: '', - protocol: '', - 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: { + connName: '', + displayName: '', + protocol: '', + 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, @@ -74,7 +74,7 @@ export class ConnectorsComponent implements OnInit { private msg: NzMessageService, @Inject(ALAIN_I18N_TOKEN) private i18n: I18NService, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { this.fetch(); @@ -90,7 +90,7 @@ export class ConnectorsComponent implements OnInit { this.fetch(); } - onReset(): void { } + onReset(): void {} onBatchDelete(e: MouseEvent): void { e.preventDefault(); diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/email-senders/email-senders.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/email-senders/email-senders.component.ts index 28b1cc62..ea00f3e3 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/email-senders/email-senders.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/email-senders/email-senders.component.ts @@ -44,9 +44,9 @@ export class EmailSendersComponent implements OnInit { submitting: boolean; model: EmailSenders; } = { - submitting: false, - model: new EmailSenders() - }; + submitting: false, + model: new EmailSenders() + }; formGroup: FormGroup = new FormGroup({}); @@ -56,7 +56,7 @@ export class EmailSendersComponent implements OnInit { private msg: NzMessageService, @Inject(ALAIN_I18N_TOKEN) private i18n: I18NService, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { this.emailSendersService.get('').subscribe(res => { diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/institutions/institutions.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/institutions/institutions.component.html index 6cf9508c..38d7e41d 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/institutions/institutions.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/institutions/institutions.component.html @@ -4,8 +4,7 @@ {{ 'mxk.institutions.id' | i18n }} - + @@ -17,8 +16,7 @@ {{ 'mxk.institutions.fullName' | i18n }} - + @@ -30,38 +28,37 @@ {{ 'mxk.institutions.defaultUri' | i18n }} - + {{ 'mxk.institutions.domain' | i18n }} - + {{ 'mxk.institutions.frontTitle' | i18n }} - + - {{ 'mxk.institutions.consoleDomain' | i18n }} - + {{ 'mxk.institutions.consoleDomain' | i18n }} - + - {{ 'mxk.institutions.consoleTitle' | i18n }} - + {{ 'mxk.institutions.consoleTitle' | i18n }} - + @@ -77,29 +74,25 @@ {{ 'mxk.institutions.contact' | i18n }} - + {{ 'mxk.institutions.phone' | i18n }} - + {{ 'mxk.institutions.email' | i18n }} - + {{ 'mxk.institutions.address' | i18n }} - + @@ -108,4 +101,4 @@
- \ No newline at end of file + diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/institutions/institutions.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/institutions/institutions.component.ts index b76affa1..bca01d53 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/institutions/institutions.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/institutions/institutions.component.ts @@ -44,9 +44,9 @@ export class InstitutionsComponent implements OnInit { submitting: boolean; model: Institutions; } = { - submitting: false, - model: new Institutions() - }; + submitting: false, + model: new Institutions() + }; formGroup: FormGroup = new FormGroup({}); @@ -56,7 +56,7 @@ export class InstitutionsComponent implements OnInit { private msg: NzMessageService, @Inject(ALAIN_I18N_TOKEN) private i18n: I18NService, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { this.institutionsService.get('').subscribe(res => { diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/ldap-context/ldap-context.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/ldap-context/ldap-context.component.html index 91ee70cb..8538e6f1 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/ldap-context/ldap-context.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/ldap-context/ldap-context.component.html @@ -4,13 +4,11 @@ {{ 'mxk.text.id' | i18n }} - + - {{ 'mxk.ldapcontext.product' | i18n }} - + {{ 'mxk.ldapcontext.product' | i18n }} @@ -22,28 +20,34 @@ {{ 'mxk.text.status' | i18n }} - + - {{ 'mxk.ldapcontext.providerUrl' | i18n }} - - - + {{ 'mxk.ldapcontext.providerUrl' | i18n }} + + - {{ 'mxk.ldapcontext.accountMapping' | i18n - }} + {{ 'mxk.ldapcontext.accountMapping' | i18n }} - + @@ -51,27 +55,28 @@ - {{ 'mxk.ldapcontext.principal' | i18n }} - + {{ 'mxk.ldapcontext.principal' | i18n }} - + - {{ 'mxk.ldapcontext.credentials' | i18n }} - + {{ 'mxk.ldapcontext.credentials' | i18n }} - + - {{ 'mxk.ldapcontext.basedn' | i18n }} - + {{ 'mxk.ldapcontext.basedn' | i18n }} - + @@ -79,25 +84,27 @@ {{ 'mxk.ldapcontext.filters' | i18n }} - + - {{ 'mxk.ldapcontext.msadDomain' | i18n }} - + {{ 'mxk.ldapcontext.msadDomain' | i18n }} - + {{ 'mxk.ldapcontext.sslSwitch' | i18n }} - + @@ -105,25 +112,26 @@ {{ 'mxk.ldapcontext.trustStore' | i18n }} - + - {{ 'mxk.ldapcontext.trustStorePassword' | i18n }} - + {{ 'mxk.ldapcontext.trustStorePassword' | i18n }} - + - - + + - \ No newline at end of file + diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/ldap-context/ldap-context.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/ldap-context/ldap-context.component.ts index d5bfa7e7..385c2ff7 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/ldap-context/ldap-context.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/ldap-context/ldap-context.component.ts @@ -44,9 +44,9 @@ export class LdapContextComponent implements OnInit { submitting: boolean; model: LdapContext; } = { - submitting: false, - model: new LdapContext() - }; + submitting: false, + model: new LdapContext() + }; formGroup: FormGroup = new FormGroup({}); @@ -56,7 +56,7 @@ export class LdapContextComponent implements OnInit { private msg: NzMessageService, @Inject(ALAIN_I18N_TOKEN) private i18n: I18NService, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { this.ldapContextService.get('').subscribe(res => { diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/notices/notices.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/notices/notices.component.ts index ac767084..ab223ed5 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/notices/notices.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/notices/notices.component.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { Component, OnInit } from '@angular/core'; @@ -23,10 +22,7 @@ import { Component, OnInit } from '@angular/core'; styleUrls: ['./notices.component.less'] }) export class NoticesComponent implements OnInit { + constructor() {} - constructor() { } - - ngOnInit(): void { - } - + ngOnInit(): void {} } diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/password-policy/password-policy.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/password-policy/password-policy.component.html index 07d73675..62ea3ee3 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/password-policy/password-policy.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/password-policy/password-policy.component.html @@ -4,152 +4,238 @@ id - + - {{ 'mxk.passwordpolicy.minLength' | i18n }} - + {{ 'mxk.passwordpolicy.minLength' | i18n }} - + - {{ 'mxk.passwordpolicy.maxLength' | i18n }} - + {{ 'mxk.passwordpolicy.maxLength' | i18n }} - + - {{ 'mxk.passwordpolicy.lowerCase' | i18n }} - + {{ 'mxk.passwordpolicy.lowerCase' | i18n }} - + - {{ 'mxk.passwordpolicy.upperCase' | i18n }} - + {{ 'mxk.passwordpolicy.upperCase' | i18n }} - + - {{ 'mxk.passwordpolicy.digits' | i18n }} - + {{ 'mxk.passwordpolicy.digits' | i18n }} - + - {{ 'mxk.passwordpolicy.specialChar' | i18n }} - + {{ 'mxk.passwordpolicy.specialChar' | i18n }} - + - {{ 'mxk.passwordpolicy.attempts' | i18n }} - + {{ 'mxk.passwordpolicy.attempts' | i18n }} - + - {{ 'mxk.passwordpolicy.duration' | i18n }} - + {{ 'mxk.passwordpolicy.duration' | i18n }} - + - {{ 'mxk.passwordpolicy.occurances' | i18n }} - + {{ 'mxk.passwordpolicy.occurances' | i18n }} - + - {{ 'mxk.passwordpolicy.expiration' | i18n }} - + {{ 'mxk.passwordpolicy.expiration' | i18n }} - + - {{ 'mxk.passwordpolicy.history' | i18n }} - + {{ 'mxk.passwordpolicy.history' | i18n }} - + - {{ 'mxk.passwordpolicy.username' | i18n }} - + {{ 'mxk.passwordpolicy.username' | i18n }} - + - {{ 'mxk.passwordpolicy.dictionary' | i18n }} - + {{ 'mxk.passwordpolicy.dictionary' | i18n }} - + - {{ 'mxk.passwordpolicy.alphabetical' | i18n - }} + {{ 'mxk.passwordpolicy.alphabetical' | i18n }} - + - {{ 'mxk.passwordpolicy.numerical' | i18n }} - + {{ 'mxk.passwordpolicy.numerical' | i18n }} - + - {{ 'mxk.passwordpolicy.qwerty' | i18n }} - + {{ 'mxk.passwordpolicy.qwerty' | i18n }} - + @@ -161,4 +247,4 @@ - \ No newline at end of file + diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/password-policy/password-policy.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/password-policy/password-policy.component.ts index 4e8d8902..9184d80c 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/password-policy/password-policy.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/password-policy/password-policy.component.ts @@ -45,9 +45,9 @@ export class PasswordPolicyComponent implements OnInit { submitting: boolean; model: PasswordPolicy; } = { - submitting: false, - model: new PasswordPolicy() - }; + submitting: false, + model: new PasswordPolicy() + }; formGroup: FormGroup = new FormGroup({}); @@ -57,7 +57,7 @@ export class PasswordPolicyComponent implements OnInit { private msg: NzMessageService, @Inject(ALAIN_I18N_TOKEN) private i18n: I18NService, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { /*this.form = this.fb.group({ diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/sms-provider/sms-provider.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/sms-provider/sms-provider.component.ts index de405d03..2792ecff 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/sms-provider/sms-provider.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/sms-provider/sms-provider.component.ts @@ -44,9 +44,9 @@ export class SmsProviderComponent implements OnInit { submitting: boolean; model: SmsProvider; } = { - submitting: false, - model: new SmsProvider() - }; + submitting: false, + model: new SmsProvider() + }; formGroup: FormGroup = new FormGroup({}); @@ -56,7 +56,7 @@ export class SmsProviderComponent implements OnInit { private msg: NzMessageService, @Inject(ALAIN_I18N_TOKEN) private i18n: I18NService, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { this.smsProviderService.get('').subscribe(res => { diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/socials-provider/socials-provider-editer/socials-provider-editer.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/socials-provider/socials-provider-editer/socials-provider-editer.component.html index 8218e8b4..33cad301 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/socials-provider/socials-provider-editer/socials-provider-editer.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/socials-provider/socials-provider-editer/socials-provider-editer.component.html @@ -4,61 +4,59 @@ {{ 'mxk.text.id' | i18n }} - + - {{ 'mxk.socialsproviders.icon' | i18n }} - + {{ 'mxk.socialsproviders.icon' | i18n }} - {{ 'mxk.socialsproviders.provider' | i18n }} - + {{ 'mxk.socialsproviders.provider' | i18n }} - + - {{ 'mxk.socialsproviders.providerName' | - i18n }} - - + {{ 'mxk.socialsproviders.providerName' | i18n }} + + - {{ 'mxk.socialsproviders.clientId' | i18n }} - + {{ 'mxk.socialsproviders.clientId' | i18n }} - + - {{ 'mxk.socialsproviders.clientSecret' | - i18n }} - - + {{ 'mxk.socialsproviders.clientSecret' | i18n }} + + {{ 'mxk.socialsproviders.agentId' | i18n }} - + - {{ 'mxk.socialsproviders.scanCode' | i18n }} - + {{ 'mxk.socialsproviders.scanCode' | i18n }} @@ -76,19 +74,22 @@ - {{ 'mxk.text.sortIndex' | i18n }} - + {{ 'mxk.text.sortIndex' | i18n }} - + {{ 'mxk.text.status' | i18n }} - + @@ -99,4 +100,4 @@
-
\ No newline at end of file + diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/socials-provider/socials-provider-editer/socials-provider-editer.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/socials-provider/socials-provider-editer/socials-provider-editer.component.ts index 280614e5..e607384b 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/socials-provider/socials-provider-editer/socials-provider-editer.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/socials-provider/socials-provider-editer/socials-provider-editer.component.ts @@ -45,9 +45,9 @@ export class SocialsProviderEditerComponent implements OnInit { submitting: boolean; model: SocialsProvider; } = { - submitting: false, - model: new SocialsProvider() - }; + submitting: false, + model: new SocialsProvider() + }; formGroup: FormGroup = new FormGroup({}); @@ -58,7 +58,7 @@ export class SocialsProviderEditerComponent implements OnInit { private msg: NzMessageService, @Inject(ALAIN_I18N_TOKEN) private i18n: I18NService, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { if (this.isEdit) { 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 d4029435..4d80252b 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) }}
@@ -29,16 +34,27 @@ + }} - + - + Id {{ 'mxk.socialsproviders.icon' | i18n }} {{ 'mxk.socialsproviders.provider' | i18n }} @@ -48,13 +64,18 @@ {{ 'mxk.socialsproviders.scanCode' | i18n }} {{ 'mxk.text.status' | i18n }} - {{ 'mxk.text.action' | i18n }} + {{ 'mxk.text.action' | i18n }} - + {{ data.id }} @@ -62,22 +83,17 @@ {{ data.provider }} {{ data.providerName }} {{ data.sortIndex }} - - + + - +
- - + +
- \ No newline at end of file + 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 601be2cb..0d2b8893 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 @@ -57,29 +57,29 @@ export class SocialsProviderComponent implements OnInit { indeterminate: boolean; checked: boolean; } = { - params: { - providerName: '', - 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: { + providerName: '', + 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, @@ -89,7 +89,7 @@ export class SocialsProviderComponent implements OnInit { private msg: NzMessageService, @Inject(ALAIN_I18N_TOKEN) private i18n: I18NService, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { this.fetch(); @@ -105,7 +105,7 @@ export class SocialsProviderComponent implements OnInit { this.fetch(); } - onReset(): void { } + onReset(): void {} onBatchDelete(e: MouseEvent): void { e.preventDefault(); diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/synchronizers/synchronizer-editer/synchronizer-editer.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/synchronizers/synchronizer-editer/synchronizer-editer.component.html index 6adfb244..5da6ebae 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/synchronizers/synchronizer-editer/synchronizer-editer.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/synchronizers/synchronizer-editer/synchronizer-editer.component.html @@ -4,13 +4,11 @@ {{ 'mxk.text.id' | i18n }} - + - {{ 'mxk.synchronizers.sourceType' | i18n }} - + {{ 'mxk.synchronizers.sourceType' | i18n }} @@ -22,132 +20,142 @@ - {{ 'mxk.synchronizers.service' | i18n }} - + {{ 'mxk.synchronizers.service' | i18n }} - + {{ 'mxk.synchronizers.scheduler' | i18n }} - + - - {{ 'mxk.synchronizers.providerUrl' | i18n }} - + " + > + {{ 'mxk.synchronizers.providerUrl' | i18n }} - + - {{ 'mxk.synchronizers.principal' | i18n }} - + {{ 'mxk.synchronizers.principal' | i18n }} - + - {{ 'mxk.synchronizers.credentials' | i18n }} - + {{ 'mxk.synchronizers.credentials' | i18n }} - + - {{ 'mxk.synchronizers.basedn' | i18n }} - + {{ 'mxk.synchronizers.basedn' | i18n }} - + - + {{ 'mxk.synchronizers.filters' | i18n }} - + - {{ 'mxk.synchronizers.msadDomain' | i18n }} - + {{ 'mxk.synchronizers.msadDomain' | i18n }} - + {{ 'mxk.synchronizers.sslSwitch' | i18n }} - + - - {{ 'mxk.synchronizers.trustStore' | i18n }} - + + {{ 'mxk.synchronizers.trustStore' | i18n }} - + - - {{ 'mxk.synchronizers.trustStorePassword' | i18n - }} + + {{ 'mxk.synchronizers.trustStorePassword' | i18n }} - + - {{ 'mxk.synchronizers.syncStartTime' | i18n }} - - - + {{ 'mxk.synchronizers.syncStartTime' | i18n }} + + - {{ 'mxk.synchronizers.resumeTime' | i18n }} - + {{ 'mxk.synchronizers.resumeTime' | i18n }} - + - {{ 'mxk.synchronizers.suspendTime' | i18n }} - + {{ 'mxk.synchronizers.suspendTime' | i18n }} - + {{ 'mxk.text.status' | i18n }} - + @@ -158,4 +166,4 @@
-
\ No newline at end of file + diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/synchronizers/synchronizer-editer/synchronizer-editer.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/synchronizers/synchronizer-editer/synchronizer-editer.component.ts index e9b3a518..a3e9438d 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/synchronizers/synchronizer-editer/synchronizer-editer.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/synchronizers/synchronizer-editer/synchronizer-editer.component.ts @@ -45,9 +45,9 @@ export class SynchronizerEditerComponent implements OnInit { submitting: boolean; model: Synchronizers; } = { - submitting: false, - model: new Synchronizers() - }; + submitting: false, + model: new Synchronizers() + }; formGroup: FormGroup = new FormGroup({}); @@ -58,7 +58,7 @@ export class SynchronizerEditerComponent implements OnInit { private msg: NzMessageService, @Inject(ALAIN_I18N_TOKEN) private i18n: I18NService, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { if (this.isEdit) { 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 570660f9..412603ea 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) }}
@@ -29,46 +27,58 @@ + }} - + - + Id {{ 'mxk.synchronizers.name' | i18n }} {{ 'mxk.synchronizers.scheduler' | i18n }} {{ 'mxk.text.status' | i18n }} - {{ 'mxk.text.action' | i18n }} + {{ 'mxk.text.action' | i18n }} - + {{ data.id }} {{ data.name }} {{ data.scheduler }} - +
- - - + + +
- \ No newline at end of file + 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 f1d74153..bfbab6f7 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 @@ -57,29 +57,29 @@ export class SynchronizersComponent implements OnInit { indeterminate: boolean; checked: boolean; } = { - params: { - name: '', - displayName: '', - protocol: '', - 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: { + name: '', + displayName: '', + protocol: '', + 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, @@ -89,7 +89,7 @@ export class SynchronizersComponent implements OnInit { private msg: NzMessageService, @Inject(ALAIN_I18N_TOKEN) private i18n: I18NService, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { this.fetch(); @@ -105,7 +105,7 @@ export class SynchronizersComponent implements OnInit { this.fetch(); } - onReset(): void { } + onReset(): void {} onBatchDelete(e: MouseEvent): void { e.preventDefault(); diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/dashboard/dashboard-routing.module.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/dashboard/dashboard-routing.module.ts index 60ba16b6..f87555b2 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/dashboard/dashboard-routing.module.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/dashboard/dashboard-routing.module.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; @@ -29,4 +28,4 @@ const routes: Routes = [ imports: [RouterModule.forChild(routes)], exports: [RouterModule] }) -export class DashboardRoutingModule { } +export class DashboardRoutingModule {} diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/dashboard/dashboard.module.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/dashboard/dashboard.module.ts index ba2f0f07..dfd37a42 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/dashboard/dashboard.module.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/dashboard/dashboard.module.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { NgModule } from '@angular/core'; import { CountDownModule } from '@delon/abc/count-down'; @@ -66,4 +65,4 @@ const COMPONENTS = [HomeComponent]; ], declarations: [...COMPONENTS] }) -export class DashboardModule { } +export class DashboardModule {} diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/dashboard/home/home.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/dashboard/home/home.component.html index 8bf15923..e1419984 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/dashboard/home/home.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/dashboard/home/home.component.html @@ -17,8 +17,16 @@

{{ 'mxk.home.onlineUsers' | i18n }}

- +
@@ -29,8 +37,16 @@

{{ 'mxk.home.dayCount' | i18n }}

- +
@@ -41,8 +57,16 @@

{{ 'mxk.home.newUsers' | i18n }}

- +
@@ -53,8 +77,16 @@

{{ 'mxk.home.activeUsers' | i18n }}

- +
@@ -115,4 +147,4 @@
- \ No newline at end of file + diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/dashboard/home/home.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/dashboard/home/home.component.ts index 518d3c99..96aa5aac 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/dashboard/home/home.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/dashboard/home/home.component.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { Platform } from '@angular/cdk/platform'; import { DOCUMENT } from '@angular/common'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organization-editer/organization-editer.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organization-editer/organization-editer.component.html index 874a6144..fdd66ca1 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organization-editer/organization-editer.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organization-editer/organization-editer.component.html @@ -6,38 +6,29 @@ {{ 'mxk.text.id' | i18n }} - + - {{ 'mxk.organizations.code' | i18n }} - + {{ 'mxk.organizations.code' | i18n }} - + - {{ 'mxk.organizations.name' | i18n }} - + {{ 'mxk.organizations.name' | i18n }} - + - {{ 'mxk.organizations.fullName' | i18n }} - - - + {{ 'mxk.organizations.fullName' | i18n }} + + - {{ 'mxk.organizations.type' | i18n }} - + {{ 'mxk.organizations.type' | i18n }} @@ -50,28 +41,27 @@ - {{ 'mxk.organizations.parentId' | i18n }} - - - + {{ 'mxk.organizations.parentId' | i18n }} + + - {{ 'mxk.organizations.parentCode' | i18n - }} - - + {{ 'mxk.organizations.parentCode' | i18n }} + + - {{ 'mxk.organizations.parentName' | i18n }} - - + {{ 'mxk.organizations.parentName' | i18n }} + - - - {{ 'mxk.text.sortIndex' | i18n }} - - + + {{ 'mxk.text.status' | i18n }} - + @@ -111,38 +101,28 @@ - {{ 'mxk.organizations.codePath' | i18n }} - - - + {{ 'mxk.organizations.codePath' | i18n }} + + - {{ 'mxk.organizations.namePath' | i18n }} - - - + {{ 'mxk.organizations.namePath' | i18n }} + + {{ 'mxk.organizations.level' | i18n }} - + - {{ 'mxk.organizations.division' | i18n }} - - - + {{ 'mxk.organizations.division' | i18n }} + + @@ -150,38 +130,31 @@ {{ 'mxk.organizations.country' | i18n }} - + {{ 'mxk.organizations.region' | i18n }} - + - {{ 'mxk.organizations.locality' | i18n }} - - - + {{ 'mxk.organizations.locality' | i18n }} + + {{ 'mxk.organizations.street' | i18n }} - + {{ 'mxk.organizations.address' | i18n }} - + @@ -189,22 +162,19 @@ {{ 'mxk.organizations.contact' | i18n }} - + {{ 'mxk.organizations.phone' | i18n }} - + {{ 'mxk.organizations.email' | i18n }} - + @@ -214,12 +184,9 @@ - {{ 'mxk.organizations.postalCode' | i18n }} - - - + {{ 'mxk.organizations.postalCode' | i18n }} + + diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organization-editer/organization-editer.component.spec.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organization-editer/organization-editer.component.spec.ts index 8a775d72..3f8c49a8 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organization-editer/organization-editer.component.spec.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organization-editer/organization-editer.component.spec.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { ComponentFixture, TestBed } from '@angular/core/testing'; @@ -25,9 +24,8 @@ describe('OrganizationEditerComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ OrganizationEditerComponent ] - }) - .compileComponents(); + declarations: [OrganizationEditerComponent] + }).compileComponents(); }); beforeEach(() => { diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organization-editer/organization-editer.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organization-editer/organization-editer.component.ts index 2072c88c..11109d53 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organization-editer/organization-editer.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organization-editer/organization-editer.component.ts @@ -52,9 +52,9 @@ export class OrganizationEditerComponent implements OnInit { submitting: boolean; model: Organizations; } = { - submitting: false, - model: new Organizations() - }; + submitting: false, + model: new Organizations() + }; formGroup: FormGroup = new FormGroup({}); @@ -65,7 +65,7 @@ export class OrganizationEditerComponent implements OnInit { private msg: NzMessageService, @Inject(ALAIN_I18N_TOKEN) private i18n: I18NService, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { if (this.isEdit) { diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organizations.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organizations.component.html index 0579191b..2518a43d 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organizations.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organizations.component.html @@ -7,18 +7,23 @@ {{ 'mxk.organizations.name' | i18n }} - +
- - + + + {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}
@@ -29,11 +34,18 @@ + }}
- + @@ -54,39 +66,51 @@
- + - + {{ '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.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.department' | i18n }} {{ 'mxk.organizations.type.entity' | i18n }} {{ 'mxk.organizations.type.virtual' | i18n }} {{ data.sortIndex }} - +
+ nz-button + type="button" + (click)="onDelete($event, data.id)" + nzDanger + >{{ 'mxk.text.delete' | i18n }}
@@ -103,4 +131,4 @@
- \ No newline at end of file + diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organizations.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organizations.component.ts index 63685053..e9861edf 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organizations.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organizations.component.ts @@ -90,26 +90,26 @@ export class OrganizationsComponent implements OnInit { indeterminate: boolean; checked: boolean; } = { - params: { - orgName: '', - displayName: '', - parentId: '', - startDate: '', - endDate: '', - startDatePicker: addDays(new Date(), -30), - endDatePicker: new Date(), - pageSize: 10, - pageNumber: 1, - pageSizeOptions: [10, 20, 50] - }, - results: new PageResults(), - expandForm: false, - submitLoading: false, - tableLoading: false, - tableCheckedId: new Set(), - indeterminate: false, - checked: false - }; + params: { + orgName: '', + displayName: '', + parentId: '', + startDate: '', + endDate: '', + startDatePicker: addDays(new Date(), -30), + endDatePicker: new Date(), + pageSize: 10, + pageNumber: 1, + pageSizeOptions: [10, 20, 50] + }, + results: new PageResults(), + expandForm: false, + submitLoading: false, + tableLoading: false, + tableCheckedId: new Set(), + indeterminate: false, + checked: false + }; // TreeNodes treeNodes = new TreeNodes(false); @@ -122,7 +122,7 @@ export class OrganizationsComponent implements OnInit { private msg: NzMessageService, @Inject(ALAIN_I18N_TOKEN) private i18n: I18NService, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { this.fetch(); @@ -139,7 +139,7 @@ export class OrganizationsComponent implements OnInit { this.fetch(); } - onReset(): void { } + onReset(): void {} onBatchDelete(e: MouseEvent): void { e.preventDefault(); diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/passport/callback.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/passport/callback.component.ts index 8b6db16f..50cf5b68 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/passport/callback.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/passport/callback.component.ts @@ -27,7 +27,7 @@ import { SettingsService } from '@delon/theme'; export class CallbackComponent implements OnInit { type = ''; - constructor(private socialService: SocialService, private settingsSrv: SettingsService, private route: ActivatedRoute) { } + constructor(private socialService: SocialService, private settingsSrv: SettingsService, private route: ActivatedRoute) {} ngOnInit(): void { this.type = this.route.snapshot.params['type']; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/passport/jwt-auth.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/passport/jwt-auth.component.ts index 4a618af5..90e9397e 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/passport/jwt-auth.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/passport/jwt-auth.component.ts @@ -36,7 +36,7 @@ export class JwtAuthComponent implements OnInit { private router: Router, private settingsSrv: SettingsService, private route: ActivatedRoute - ) { } + ) {} ngOnInit(): void { this.jwt = this.route.snapshot.queryParams['jwt']; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/passport/lock/lock.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/passport/lock/lock.component.ts index 14c3dd98..fb9d9a41 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/passport/lock/lock.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/passport/lock/lock.component.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { Component, Inject } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/passport/passport-routing.module.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/passport/passport-routing.module.ts index 9d729d24..461ae461 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/passport/passport-routing.module.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/passport/passport-routing.module.ts @@ -61,4 +61,4 @@ const routes: Routes = [ imports: [RouterModule.forChild(routes)], exports: [RouterModule] }) -export class PassportRoutingModule { } +export class PassportRoutingModule {} diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/passport/passport.module.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/passport/passport.module.ts index 2034529f..7d2356c6 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/passport/passport.module.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/passport/passport.module.ts @@ -30,4 +30,4 @@ const COMPONENTS = [UserLoginComponent, UserRegisterResultComponent, UserRegiste imports: [SharedModule, PassportRoutingModule], declarations: [...COMPONENTS] }) -export class PassportModule { } +export class PassportModule {} diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/passport/register-result/register-result.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/passport/register-result/register-result.component.ts index 41a47224..ecc5a529 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/passport/register-result/register-result.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/passport/register-result/register-result.component.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { Component } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/passport/register/register.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/passport/register/register.component.ts index bc3c2994..1e4e2fe8 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/passport/register/register.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/passport/register/register.component.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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, ChangeDetectorRef, Component, OnDestroy } from '@angular/core'; import { AbstractControl, FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/permissions.module.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/permissions.module.ts index 7387bd8a..47bd2419 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/permissions.module.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/permissions.module.ts @@ -43,4 +43,4 @@ const COMPONENTS = [ResourcesComponent, PrivilegesComponent, ResourceEditerCompo imports: [NzIconModule, SharedModule, CommonModule, RouterModule.forChild(routes)], exports: [RouterModule] }) -export class PermissionsModule { } +export class PermissionsModule {} diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/privileges/privileges.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/privileges/privileges.component.html index c9b10b44..18d43049 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/privileges/privileges.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/privileges/privileges.component.html @@ -7,8 +7,14 @@ {{ 'mxk.roles.name' | i18n }} - + @@ -17,23 +23,28 @@ {{ 'mxk.resources.appName' | i18n }} - + - +
- - + + + {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}
@@ -44,11 +55,21 @@
- + {{ 'mxk.users.costCenter' | i18n }} - - + + {{ 'mxk.users.jobLevel' | i18n }} - - + +
{{ 'mxk.users.jobTitle' | i18n }} - - + + {{ 'mxk.users.manager' | i18n }} - - + +
{{ 'mxk.users.assistant' | i18n }} - - + + - {{ 'mxk.users.workOfficeName' | i18n }} - - - + {{ 'mxk.users.workOfficeName' | i18n }} + +
{{ 'mxk.users.entryDate' | i18n }} - - + + {{ 'mxk.users.quitDate' | i18n }} - - + +
@@ -409,77 +431,81 @@
- {{ 'mxk.users.workPhoneNumber' | i18n }} - - - + {{ 'mxk.users.workPhoneNumber' | i18n }} + + {{ 'mxk.users.workEmail' | i18n }} - - + +
- {{ 'mxk.users.workCountry' | i18n }} - - - + {{ 'mxk.users.workCountry' | i18n }} + + {{ 'mxk.users.workRegion' | i18n }} - - + +
{{ 'mxk.users.workLocality' | i18n }} - - + + - {{ 'mxk.users.workStreetAddress' | i18n }} - - - + {{ 'mxk.users.workStreetAddress' | i18n }} + +
- {{ 'mxk.users.workPostalCode' | i18n }} - - - + {{ 'mxk.users.workPostalCode' | i18n }} + + {{ 'mxk.users.workFax' | i18n }} - - + +
@@ -488,76 +514,80 @@
{{ 'mxk.users.homeEmail' | i18n }} - - + + - {{ 'mxk.users.homePhoneNumber' | i18n }} - - - + {{ 'mxk.users.homePhoneNumber' | i18n }} + +
{{ 'mxk.users.homeFax' | i18n }} - - + + - {{ 'mxk.users.homePostalCode' | i18n }} - - - + {{ 'mxk.users.homePostalCode' | i18n }} + +
- {{ 'mxk.users.homeCountry' | i18n }} - - - + {{ 'mxk.users.homeCountry' | i18n }} + + {{ 'mxk.users.homeRegion' | i18n }} - - + +
{{ 'mxk.users.homeLocality' | i18n }} - - + + - {{ 'mxk.users.homeStreetAddress' | i18n }} - - - + {{ 'mxk.users.homeStreetAddress' | i18n }} + +
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/users/user-editer/user-editer.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/users/user-editer/user-editer.component.ts index 3f8d8829..32218924 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/users/user-editer/user-editer.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/users/user-editer/user-editer.component.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { Component, ChangeDetectorRef, Input, OnInit, Inject, ViewChild} from '@angular/core'; +import { Component, ChangeDetectorRef, Input, OnInit, Inject, ViewChild } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { I18NService } from '@core'; import { _HttpClient, ALAIN_I18N_TOKEN, SettingsService } from '@delon/theme'; @@ -23,11 +23,11 @@ import format from 'date-fns/format'; import { NzMessageService } from 'ng-zorro-antd/message'; import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal'; import { NzFormatEmitEvent, NzTreeNode, NzTreeNodeOptions } from 'ng-zorro-antd/tree'; +import { NzTreeSelectComponent } from 'ng-zorro-antd/tree-select'; import { NzUploadFile, NzUploadChangeParam } from 'ng-zorro-antd/upload'; import { Users } from '../../../entity/Users'; import { UsersService } from '../../../service/users.service'; -import { NzTreeSelectComponent } from "ng-zorro-antd/tree-select"; const getBase64 = (file: File): Promise => new Promise((resolve, reject) => { @@ -68,14 +68,14 @@ export class UserEditerComponent implements OnInit { @Input() parentNode?: NzTreeNode; @Input() isEdit?: boolean; @Input() orgNodes!: any[]; - @ViewChild("orgTree") orgTree!: NzTreeSelectComponent; + @ViewChild('orgTree') orgTree!: NzTreeSelectComponent; form: { submitting: boolean; model: Users; } = { - submitting: false, - model: new Users() - }; + submitting: false, + model: new Users() + }; formGroup: FormGroup = new FormGroup({}); @@ -106,7 +106,7 @@ export class UserEditerComponent implements OnInit { private msg: NzMessageService, @Inject(ALAIN_I18N_TOKEN) private i18n: I18NService, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { if (this.isEdit) { @@ -132,8 +132,8 @@ export class UserEditerComponent implements OnInit { } onDeptChange(key: string): void { let node = this.orgTree.getTreeNodeByKey(key); - if (node){ - this.form.model.department = node.title + if (node) { + this.form.model.department = node.title; } } onClose(e: MouseEvent): void { diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/users/users.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/users/users.component.html index 6d626ac7..cbfec6f6 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/users/users.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/users/users.component.html @@ -7,18 +7,23 @@ {{ 'mxk.users.username' | i18n }} - +
- - + + + {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}
@@ -37,8 +42,15 @@
- + @@ -59,15 +71,26 @@
- + - + {{ 'mxk.text.id' | i18n }} {{ 'mxk.users.username' | i18n }} {{ 'mxk.users.displayName' | i18n }} @@ -76,13 +99,18 @@ {{ 'mxk.users.jobTitle' | i18n }} {{ 'mxk.users.gender' | i18n }} {{ 'mxk.text.status' | i18n }} - {{ 'mxk.text.action' | i18n }} + {{ 'mxk.text.action' | i18n }} - + {{ data.id }} @@ -91,8 +119,7 @@ {{ data.employeeNumber }} {{ 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) }} @@ -121,27 +148,25 @@
    -
  • {{ +
  • {{ 'mxk.text.roles' | i18n - }}
  • + }}
  • {{ 'mxk.text.changepassword' | i18n - }}
  • -
  • {{ - 'mxk.text.lock' | i18n }}
  • + }} +
  • {{ 'mxk.text.lock' | i18n }}
  • {{ 'mxk.text.disable' | i18n - }}
  • + }}
  • {{ 'mxk.text.enable' | i18n - }}
  • + }}
  • {{ 'mxk.text.enable' | i18n - }}
  • + }}
  • {{ 'mxk.text.unlock' | i18n - }}
  • + }}
  • {{ 'mxk.text.delete' | i18n }}
@@ -152,4 +177,4 @@
- \ No newline at end of file + diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/users/users.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/users/users.component.ts index c1dc3321..9f2efb9a 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/users/users.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/users/users.component.ts @@ -64,27 +64,27 @@ export class UsersComponent implements OnInit { indeterminate: boolean; checked: boolean; } = { - params: { - name: '', - displayName: '', - departmentId: '', - username: '', - startDate: '', - endDate: '', - startDatePicker: addDays(new Date(), -30), - endDatePicker: new Date(), - pageSize: 10, - pageNumber: 1, - pageSizeOptions: [10, 20, 50] - }, - results: new PageResults(), - expandForm: false, - submitLoading: false, - tableLoading: false, - tableCheckedId: new Set(), - indeterminate: false, - checked: false - }; + params: { + name: '', + displayName: '', + departmentId: '', + username: '', + startDate: '', + endDate: '', + startDatePicker: addDays(new Date(), -30), + endDatePicker: new Date(), + pageSize: 10, + pageNumber: 1, + pageSizeOptions: [10, 20, 50] + }, + results: new PageResults(), + expandForm: false, + submitLoading: false, + tableLoading: false, + tableCheckedId: new Set(), + indeterminate: false, + checked: false + }; // TreeNodes treeNodes = new TreeNodes(false); @@ -99,7 +99,7 @@ export class UsersComponent implements OnInit { @Inject(ALAIN_I18N_TOKEN) private i18n: I18NService, private router: Router, private cdr: ChangeDetectorRef - ) { } + ) {} ngOnInit(): void { this.fetch(); @@ -116,7 +116,7 @@ export class UsersComponent implements OnInit { this.fetch(); } - onReset(): void { } + onReset(): void {} onBatchDelete(e: MouseEvent): void { e.preventDefault(); diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/widgets/widgets-routing.module.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/widgets/widgets-routing.module.ts index e346fe56..09a36da2 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/widgets/widgets-routing.module.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/widgets/widgets-routing.module.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/widgets/widgets.module.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/widgets/widgets.module.ts index 221ed517..79f900ab 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/widgets/widgets.module.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/widgets/widgets.module.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { NgModule, Type } from '@angular/core'; import { G2MiniAreaModule } from '@delon/chart/mini-area'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/widgets/widgets/widgets.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/widgets/widgets/widgets.component.ts index 1dee06b0..55ab9c8d 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/widgets/widgets/widgets.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/widgets/widgets/widgets.component.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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, ChangeDetectorRef, Component, OnInit } from '@angular/core'; import { G2MiniBarData } from '@delon/chart/mini-bar'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/accounts-strategy.service.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/accounts-strategy.service.ts index ace9f722..ffd5e865 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/accounts-strategy.service.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/accounts-strategy.service.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/adapters.service.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/adapters.service.ts index 52f9764a..2245a3f9 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/adapters.service.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/adapters.service.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/analysis.service.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/analysis.service.ts index eb528254..7dd4a82f 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/analysis.service.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/analysis.service.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { HttpClient, HttpParams } from '@angular/common/http'; import { Injectable } from '@angular/core'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/apps-cas-details.service.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/apps-cas-details.service.ts index b4c9ead7..da63a494 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/apps-cas-details.service.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/apps-cas-details.service.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/apps-extend-api-details.service.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/apps-extend-api-details.service.ts index 5d8fb5d1..62f32954 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/apps-extend-api-details.service.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/apps-extend-api-details.service.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/apps-form-based-details.service.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/apps-form-based-details.service.ts index 550e88b0..cedd37da 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/apps-form-based-details.service.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/apps-form-based-details.service.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/apps-jwt-details.service.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/apps-jwt-details.service.ts index 4e5e3535..9cf106a9 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/apps-jwt-details.service.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/apps-jwt-details.service.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/apps-oauth20-details.service.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/apps-oauth20-details.service.ts index fc0bd206..2b3e5b19 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/apps-oauth20-details.service.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/apps-oauth20-details.service.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/apps-saml-details.service.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/apps-saml-details.service.ts index 2d65a6a9..c32728f9 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/apps-saml-details.service.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/apps-saml-details.service.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/apps-token-based-details.service.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/apps-token-based-details.service.ts index 0f7a8a08..817ca2e5 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/apps-token-based-details.service.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/apps-token-based-details.service.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/authn.service.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/authn.service.ts index 8cf60ab0..78b19cce 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/authn.service.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/authn.service.ts @@ -38,7 +38,7 @@ export class AuthnService { private startupService: StartupService, @Inject(DA_SERVICE_TOKEN) private tokenService: ITokenService, private http: _HttpClient - ) { } + ) {} setRedirectUri(redirect_uri: string) { this.redirect_uri = CryptoJS.enc.Base64url.parse(redirect_uri).toString(); diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/base.service.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/base.service.ts index 89c17458..764217fc 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/base.service.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/base.service.ts @@ -41,20 +41,20 @@ export class BaseService { memberOut: string; }; } = { - urls: { - base: '', - fetch: '/fetch', - add: '/add', - get: '/get', - load: '/load', - update: '/update', - delete: '/delete', - test: '/test', - tree: '/tree', - member: '/member', - memberOut: '/memberOut' - } - }; + urls: { + base: '', + fetch: '/fetch', + add: '/add', + get: '/get', + load: '/load', + update: '/update', + delete: '/delete', + test: '/test', + tree: '/tree', + member: '/member', + memberOut: '/memberOut' + } + }; constructor(httpClient: HttpClient, baseURL: string) { this.server.urls.base = baseURL; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/email-senders.service.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/email-senders.service.ts index 437d5b9e..4c4e1d15 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/email-senders.service.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/email-senders.service.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/history.service.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/history.service.ts index 1cc70f2e..8af37383 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/history.service.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/history.service.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { HttpClient, HttpParams } from '@angular/common/http'; import { Injectable } from '@angular/core'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/image-captcha.service.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/image-captcha.service.ts index 85458e93..47d4b15d 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/image-captcha.service.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/image-captcha.service.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { Injectable } from '@angular/core'; import { SettingsService, _HttpClient, User } from '@delon/theme'; @@ -22,7 +21,7 @@ import { SettingsService, _HttpClient, User } from '@delon/theme'; providedIn: 'root' }) export class ImageCaptchaService { - constructor(private http: _HttpClient) { } + constructor(private http: _HttpClient) {} captcha(param: any) { return this.http.get('/captcha?_allow_anonymous=true', param); diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/institutions.service.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/institutions.service.ts index c1857716..27579ced 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/institutions.service.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/institutions.service.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { HttpClient, HttpParams } from '@angular/common/http'; import { Injectable } from '@angular/core'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/ldap-context.service.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/ldap-context.service.ts index 69259565..9eec3016 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/ldap-context.service.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/ldap-context.service.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/organizations.service.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/organizations.service.ts index dc51c9c2..f74a7202 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/organizations.service.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/organizations.service.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/password-policy.service.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/password-policy.service.ts index 0a586a4f..f4866ede 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/password-policy.service.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/password-policy.service.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/sms-provider.service.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/sms-provider.service.ts index fd483f12..ef4f2c2f 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/sms-provider.service.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/sms-provider.service.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/socials-provider.service.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/socials-provider.service.ts index 675a3785..e2b3f9c8 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/socials-provider.service.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/socials-provider.service.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/consts.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/consts.ts index 16fdee46..e91d5817 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/consts.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/consts.ts @@ -15,9 +15,9 @@ */ export const CONSTS = { - CONGRESS: 'congress', - INST: 'inst', - REDIRECT_URI: 'redirect_uri', - REMEMBER: 'remember', - VERSION: 'v3.5.9 GA' + CONGRESS: 'congress', + INST: 'inst', + REDIRECT_URI: 'redirect_uri', + REMEMBER: 'remember', + VERSION: 'v3.5.9 GA' }; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/json-schema/json-schema.module.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/json-schema/json-schema.module.ts index 346436ca..70278b1c 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/json-schema/json-schema.module.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/json-schema/json-schema.module.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { NgModule } from '@angular/core'; import { DelonFormModule, WidgetRegistry } from '@delon/form'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/shared-delon.module.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/shared-delon.module.ts index 516fa1a7..6294cade 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/shared-delon.module.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/shared-delon.module.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { PageHeaderModule } from '@delon/abc/page-header'; import { ResultModule } from '@delon/abc/result'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/shared-zorro.module.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/shared-zorro.module.ts index ebd8c47b..9227b0c2 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/shared-zorro.module.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/shared-zorro.module.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { NzAlertModule } from 'ng-zorro-antd/alert'; import { NzAvatarModule } from 'ng-zorro-antd/avatar'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/shared.module.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/shared.module.ts index 41e26832..221134fd 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/shared.module.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/shared.module.ts @@ -81,4 +81,4 @@ const DIRECTIVES: Array> = []; ...DIRECTIVES ] }) -export class SharedModule { } +export class SharedModule {} diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/st-widget/st-widget.module.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/st-widget/st-widget.module.ts index ac17c357..0f1eee74 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/st-widget/st-widget.module.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/st-widget/st-widget.module.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { NgModule } from '@angular/core'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/utils/knowhost.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/utils/knowhost.ts index 4736c93b..1fcd2908 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/utils/knowhost.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/utils/knowhost.ts @@ -1,26 +1,25 @@ /* * Copyright [2022] [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. */ - export function knowHost() { - let hostArray: string[] = new Array('localhost', 'sso.maxkey.top', 'mgt.maxkey.top', 'sso.maxsso.net', 'mgt.maxsso.net'); - for (var i = 0; i < hostArray.length; i++) { - if (hostArray[i] == location.hostname) { - return true; - } + let hostArray: string[] = new Array('localhost', 'sso.maxkey.top', 'mgt.maxkey.top', 'sso.maxsso.net', 'mgt.maxsso.net'); + for (var i = 0; i < hostArray.length; i++) { + if (hostArray[i] == location.hostname) { + return true; } - return false; + } + return false; } diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/utils/set2stringstil.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/utils/set2stringstil.ts index f779b3fc..6895b1ad 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/utils/set2stringstil.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/utils/set2stringstil.ts @@ -15,9 +15,9 @@ */ export function set2String(set: Set): string { - let setValues = ''; - set.forEach(value => { - setValues = `${setValues + value},`; - }); - return setValues; + let setValues = ''; + set.forEach(value => { + setValues = `${setValues + value},`; + }); + return setValues; } diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/utils/yuan.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/utils/yuan.ts index 6995238f..23902319 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/utils/yuan.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/utils/yuan.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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. */ - /** * 转化成RMB元字符串 diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/layout-default/index.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/layout-default/index.ts index 9bf5ca3d..72c673a8 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/layout-default/index.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/layout-default/index.ts @@ -1,18 +1,17 @@ /* * Copyright [2022] [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. */ - export * from './public_api'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/layout-default/layout-header-item-trigger.directive.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/layout-default/layout-header-item-trigger.directive.ts index e722c686..247454d2 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/layout-default/layout-header-item-trigger.directive.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/layout-default/layout-header-item-trigger.directive.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { Directive } from '@angular/core'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/layout-default/layout-header-item.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/layout-default/layout-header-item.component.ts index e3607c81..31129f6a 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/layout-default/layout-header-item.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/layout-default/layout-header-item.component.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { Component, Input, TemplateRef, ViewChild } from '@angular/core'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/layout-default/layout-header.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/layout-default/layout-header.component.ts index 4beb998d..f83515e8 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/layout-default/layout-header.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/layout-default/layout-header.component.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { AfterViewInit, diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/layout-default/layout-nav.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/layout-default/layout-nav.component.ts index e414e460..4482ec51 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/layout-default/layout-nav.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/layout-default/layout-nav.component.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { Direction, Directionality } from '@angular/cdk/bidi'; import { DOCUMENT } from '@angular/common'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/layout-default/layout.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/layout-default/layout.component.ts index ffcb1d2e..d765d5be 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/layout-default/layout.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/layout-default/layout.component.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { DOCUMENT } from '@angular/common'; import { Component, ContentChildren, ElementRef, Inject, Input, OnDestroy, OnInit, QueryList, Renderer2, TemplateRef } from '@angular/core'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/layout-default/layout.module.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/layout-default/layout.module.ts index 9342e456..ea94cf03 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/layout-default/layout.module.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/layout-default/layout.module.ts @@ -1,24 +1,22 @@ /* * Copyright [2022] [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 { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; - import { NzAvatarModule } from 'ng-zorro-antd/avatar'; import { NzBadgeModule } from 'ng-zorro-antd/badge'; import { NzDropDownModule } from 'ng-zorro-antd/dropdown'; @@ -41,16 +39,7 @@ const COMPONENTS = [ ]; @NgModule({ - imports: [ - CommonModule, - RouterModule, - NzToolTipModule, - NzIconModule, - NzAvatarModule, - NzDropDownModule, - NzMessageModule, - NzBadgeModule - ], + imports: [CommonModule, RouterModule, NzToolTipModule, NzIconModule, NzAvatarModule, NzDropDownModule, NzMessageModule, NzBadgeModule], declarations: COMPONENTS, exports: COMPONENTS }) diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/layout-default/public_api.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/layout-default/public_api.ts index c6a29d6f..a6d11f8e 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/layout-default/public_api.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/layout-default/public_api.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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. */ - export * from './layout.component'; export * from './layout.module'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/layout-default/types.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/layout-default/types.ts index bb3f15c0..5633e29a 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/layout-default/types.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/layout-default/types.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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. */ - export type LayoutDefaultHeaderItemHidden = 'pc' | 'mobile' | 'none'; export type LayoutDefaultHeaderItemDirection = 'left' | 'middle' | 'right'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/theme-btn/index.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/theme-btn/index.ts index 9bf5ca3d..72c673a8 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/theme-btn/index.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/theme-btn/index.ts @@ -1,18 +1,17 @@ /* * Copyright [2022] [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. */ - export * from './public_api'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/theme-btn/public_api.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/theme-btn/public_api.ts index 917844d5..1b82a5f3 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/theme-btn/public_api.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/theme-btn/public_api.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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. */ - export * from './theme-btn.component'; export * from './theme-btn.module'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/theme-btn/theme-btn.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/theme-btn/theme-btn.component.ts index 2d027b93..5d97fec9 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/theme-btn/theme-btn.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/theme-btn/theme-btn.component.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { Direction, Directionality } from '@angular/cdk/bidi'; import { Platform } from '@angular/cdk/platform'; @@ -75,7 +74,7 @@ export class ThemeBtnComponent implements OnInit, OnDestroy { @Inject(DOCUMENT) private doc: NzSafeAny, @Optional() private directionality: Directionality, @Inject(ALAIN_THEME_BTN_KEYS) private KEYS: string - ) { } + ) {} ngOnInit(): void { this.dir = this.directionality.value; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/theme-btn/theme-btn.module.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/theme-btn/theme-btn.module.ts index 4a99bd89..723f13bc 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/theme-btn/theme-btn.module.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/theme/theme-btn/theme-btn.module.ts @@ -1,23 +1,21 @@ /* * Copyright [2022] [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 { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; - import { NzDropDownModule } from 'ng-zorro-antd/dropdown'; import { NzToolTipModule } from 'ng-zorro-antd/tooltip'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/main.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/main.ts index 9ad0584f..e50f8be9 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/main.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/main.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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 { enableProdMode, ViewEncapsulation } from '@angular/core'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/polyfills.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/polyfills.ts index e5d17128..7f2412ab 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/polyfills.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/polyfills.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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. */ - /* eslint-disable import/no-unassigned-import */ /** diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/style-icons.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/style-icons.ts index 9b092dae..64c8018b 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/style-icons.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/style-icons.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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. */ - // Custom icon static resources diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/typings.d.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/typings.d.ts index b43165d2..709edb81 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/typings.d.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/typings.d.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [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. */ - // # 3rd Party Library // If the library doesn't have typings available at `@types/`,