From d3924dbb37789796c98ab747a82589946ab4ea98 Mon Sep 17 00:00:00 2001 From: shimingxy Date: Wed, 14 Aug 2024 15:21:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E6=96=87=E5=AD=97=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../access/access/access.component.html | 139 +++++------------ .../routes/accounts/accounts.component.html | 94 ++++-------- .../src/app/routes/apps/apps.component.html | 80 ++++------ .../accounts-strategy.component.html | 90 ++++------- .../config/adapters/adapters.component.html | 84 ++++------- .../connectors/connectors.component.html | 87 ++++------- .../socials-provider.component.html | 93 ++++-------- .../synchronizers.component.html | 80 ++++------ .../group-members.component.html | 140 +++++------------- .../routes/idm/groups/groups.component.html | 91 ++++-------- .../organizations.component.html | 99 ++++--------- .../app/routes/idm/users/users.component.html | 119 +++++---------- .../resources/resources.component.html | 102 ++++--------- .../role-members/role-members.component.html | 122 +++++---------- .../permissions/roles/roles.component.html | 89 ++++------- .../src/assets/i18n/en-US.json | 11 +- .../src/assets/i18n/zh-CN.json | 11 +- .../src/assets/i18n/zh-TW.json | 11 +- 18 files changed, 483 insertions(+), 1059 deletions(-) diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/access/access.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/access/access.component.html index bb6ef0c0..fe6cc195 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/access/access.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/access/access.component.html @@ -8,39 +8,23 @@ {{ 'mxk.groups.name' | i18n }} - +
+ }}
- + @@ -51,11 +35,8 @@ - + {{ data.id }} @@ -74,37 +55,26 @@
{{ 'mxk.roles.name' | i18n }} - +
{{ 'mxk.apps.name' | i18n }} - +
- - + + + {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}
@@ -112,46 +82,25 @@
- - + + [nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n" (nzOnConfirm)="onBatchDelete()" + [nzType]="'primary'" nzDanger class="mx-sm">{{ 'mxk.text.batchDelete' | i18n }}
- + - + Id {{ 'mxk.roles.name' | i18n }} {{ 'mxk.apps.icon' | i18n }} @@ -162,11 +111,8 @@ - + {{ data.groupName }} {{ data.appName }} @@ -202,18 +148,11 @@
- + [nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n" (nzOnConfirm)="onDelete(data.id)" + nzDanger>{{ 'mxk.text.delete' | i18n }}
@@ -224,4 +163,4 @@
-
+ \ No newline at end of file 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 6f6ec2dc..c9178d77 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,18 +8,12 @@ {{ 'mxk.accounts.appName' | i18n }} - + - + @@ -28,24 +22,18 @@ {{ 'mxk.accounts.username' | i18n }} - +
- + + {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}
@@ -53,39 +41,19 @@
- +
- + - + Id {{ 'mxk.accounts.username' | i18n }} {{ 'mxk.accounts.displayName' | i18n }} @@ -96,11 +64,8 @@ - + {{ data.id }} @@ -111,21 +76,14 @@
- + [nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n" (nzOnConfirm)="onDelete(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/apps/apps.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/apps.component.html index 6c829c4f..b4a9867b 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,14 +7,8 @@ {{ 'mxk.apps.name' | i18n }} - + @@ -40,11 +34,12 @@
- - + + + {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}
@@ -54,42 +49,21 @@
+ }} - +
- + - + {{ 'mxk.apps.icon' | i18n }} {{ 'mxk.text.id' | i18n }} @@ -103,11 +77,8 @@ - + {{ data.id }} @@ -144,15 +115,18 @@
{{ 'mxk.apps.category.1912' | i18n }}
{{ data.sortIndex }} - +
- + - +
- + \ 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.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/accounts-strategy/accounts-strategy.component.html index c8534441..4527d2ed 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,17 +7,19 @@ {{ 'mxk.accountsstrategy.name' | i18n }} - +
- - + + + {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}
@@ -25,84 +27,54 @@
- +
- + - + 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) }} + +
- - + + [nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n" (nzOnConfirm)="onDelete(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/config/adapters/adapters.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/adapters/adapters.component.html index afee300f..828f2d3c 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,17 +7,19 @@ {{ 'mxk.adapters.name' | i18n }} - +
- - + + + {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}
@@ -25,57 +27,31 @@
- +
- + - + 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 }} @@ -85,22 +61,16 @@ {{ data.description }}
- - + + [nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n" (nzOnConfirm)="onDelete(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/config/connectors/connectors.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/connectors/connectors.component.html index 7a176f41..d850d1d7 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/connectors/connectors.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/connectors/connectors.component.html @@ -7,24 +7,19 @@ {{ 'mxk.connectors.connName' | i18n }} - +
- - + + + {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}
@@ -32,40 +27,19 @@
- +
- + - + Id {{ 'mxk.connectors.connName' | i18n }} {{ 'mxk.connectors.justInTime' | i18n }} @@ -75,11 +49,8 @@ - + {{ data.id }} @@ -87,25 +58,19 @@ {{ data.connName }} {{ 'mxk.text.yes' | i18n }} {{ 'mxk.text.no' | i18n }} - +
- + [nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n" (nzOnConfirm)="onDelete(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/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 6fdcd862..cb66e3aa 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,24 +7,19 @@ {{ 'mxk.socialsproviders.providerName' | i18n }} - +
- - + + + {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}
@@ -32,40 +27,19 @@
- +
- + - + Id {{ 'mxk.socialsproviders.icon' | i18n }} {{ 'mxk.socialsproviders.provider' | i18n }} @@ -80,11 +54,8 @@ - + {{ data.id }} @@ -92,28 +63,24 @@ {{ data.provider }} {{ data.providerName }} {{ data.sortIndex }} - - + + - +
- + [nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n" (nzOnConfirm)="onDelete(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/config/synchronizers/synchronizers.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/synchronizers/synchronizers.component.html index 3196aa7e..6b5dcb8b 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,17 +7,19 @@ {{ 'mxk.synchronizers.name' | i18n }} - +
- - + + + {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}
@@ -25,40 +27,19 @@
- +
- + - + Id {{ 'mxk.synchronizers.name' | i18n }} {{ 'mxk.synchronizers.scheduler' | i18n }} @@ -68,37 +49,28 @@ - + {{ data.id }} {{ data.name }} {{ data.scheduler }} - +
- + [nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n" (nzOnConfirm)="onDelete(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/idm/group-members/group-members.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/group-members/group-members.component.html index 526fc2c5..126d4d9f 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/group-members/group-members.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/group-members/group-members.component.html @@ -8,39 +8,23 @@ {{ 'mxk.groups.name' | i18n }} - +
+ }}
- + @@ -51,11 +35,8 @@ - + {{ data.id }} @@ -74,37 +55,25 @@
{{ 'mxk.roles.name' | i18n }} - +
{{ 'mxk.users.username' | i18n }} - +
- + + {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}
@@ -112,46 +81,25 @@
- - + + [nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n" (nzOnConfirm)="onBatchDelete()" + [nzType]="'primary'" nzDanger class="mx-sm">{{ 'mxk.text.batchDelete' | i18n }}
- + - + {{ 'mxk.roles.name' | i18n }} {{ 'mxk.users.username' | i18n }} {{ 'mxk.users.displayName' | i18n }} @@ -163,32 +111,22 @@ - + {{ data.groupName }} {{ data.username }} {{ data.displayName }} {{ data.department }} {{ data.jobTitle }} - {{ data.gender == 1 ? ('mxk.users.gender.female' | i18n) : ('mxk.users.gender.male' | i18n) }} + {{ data.gender == 1 ? ('mxk.users.gender.female' | i18n) : + ('mxk.users.gender.male' | i18n) }}
- + [nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n" (nzOnConfirm)="onDelete(data.id)" + nzDanger>{{ 'mxk.text.delete' | i18n }}
@@ -199,4 +137,4 @@
-
+ \ No newline at end of file diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/groups.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/groups.component.html index ffccb059..51fd50b6 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/groups.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/groups.component.html @@ -7,24 +7,19 @@ {{ 'mxk.groups.name' | i18n }} - +
- - + + + {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}
@@ -32,40 +27,19 @@
- +
- + - + Id {{ 'mxk.groups.name' | i18n }} {{ 'mxk.groups.category' | i18n }} @@ -75,11 +49,8 @@ - + {{ data.id }} @@ -98,20 +69,16 @@
    -
  • {{ 'mxk.groups.member' | i18n }}
  • -
  • {{ 'mxk.groups.permissions' | i18n }}
  • -
  • {{ 'mxk.groups.member' | i18n }} +
  • +
  • {{ 'mxk.groups.permissions' | + i18n }}
  • +
  • {{ 'mxk.text.delete' | i18n }}
  • + nz-popconfirm nzPopconfirmTitle="{{ 'mxk.text.delete.popconfirm.title' | i18n }}" + nzPopconfirmPlacement="left" [nzCancelText]="'mxk.text.delete.popconfirm.cancelText' | i18n" + [nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n" (nzOnConfirm)="onDelete(data.id)" nzDanger>{{ + 'mxk.text.delete' | i18n }}
@@ -119,4 +86,4 @@
-
+ \ No newline at end of file diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/organizations/organizations.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/organizations/organizations.component.html index 507a1dd3..e1bd8df7 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/organizations/organizations.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/organizations/organizations.component.html @@ -7,23 +7,18 @@ {{ 'mxk.organizations.name' | i18n }} - +
- - + + + {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}
@@ -32,31 +27,14 @@
- +
- + @@ -77,24 +55,14 @@
- + - + {{ 'mxk.organizations.code' | i18n }} {{ 'mxk.organizations.name' | i18n }} {{ 'mxk.organizations.type' | i18n }} @@ -105,22 +73,21 @@ - + {{ 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 }} - +
+ [nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n" (nzOnConfirm)="onDelete(data.id)" nzDanger>{{ + 'mxk.text.delete' | i18n }}
@@ -146,4 +107,4 @@
- + \ No newline at end of file diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/users/users.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/users/users.component.html index 4c8078fd..7fa6cbaf 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/users/users.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/users/users.component.html @@ -7,23 +7,18 @@ {{ 'mxk.users.username' | i18n }} - +
- - + + + {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}
@@ -37,32 +32,16 @@ -
- + @@ -83,26 +62,15 @@
- + - + {{ 'mxk.text.id' | i18n }} {{ 'mxk.users.username' | i18n }} {{ 'mxk.users.displayName' | i18n }} @@ -116,11 +84,8 @@ - + {{ data.id }} @@ -129,7 +94,8 @@ {{ 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) }} @@ -162,36 +128,31 @@
    -
  • {{ +
  • {{ 'mxk.text.groups' | 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 }}
  • + }} +
  • {{ 'mxk.text.delete' | i18n }}
@@ -201,4 +162,4 @@
- + \ No newline at end of file diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/resources/resources.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/resources/resources.component.html index d7f97b82..94ed1895 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/resources/resources.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/resources/resources.component.html @@ -6,30 +6,26 @@
{{ 'mxk.resources.appName' | i18n }} - +
{{ 'mxk.resources.name' | i18n }} - +
- - + + + {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}
@@ -38,31 +34,14 @@
- +
- + @@ -83,25 +62,15 @@
- + - + {{ 'mxk.resources.appName' | i18n }} {{ 'mxk.resources.name' | i18n }} {{ 'mxk.resources.resourceType' | i18n }} @@ -112,33 +81,24 @@ - + {{ data.appName }} {{ data.resourceName }} {{ data.resourceType }} {{ data.sortIndex }} - +
- + [nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n" (nzOnConfirm)="onDelete(data.id)" nzDanger>{{ + 'mxk.text.delete' | i18n }}
@@ -146,4 +106,4 @@
- + \ No newline at end of file diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/role-members/role-members.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/role-members/role-members.component.html index 0a62bb8c..97520c32 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/role-members/role-members.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/role-members/role-members.component.html @@ -18,26 +18,16 @@
+ }}
- +