From 0d7cf69a98bab55cb4b42ea7a6b48107cdbf622c Mon Sep 17 00:00:00 2001
From: MaxKey <shimingxy@qq.com>
Date: Sun, 3 Jul 2022 19:05:52 +0800
Subject: [PATCH] =?UTF-8?q?remove=20select=20apps=20protocol,=E6=9C=BA?=
 =?UTF-8?q?=E6=9E=84=E7=AE=A1=E7=90=86=20->=E6=9C=BA=E6=9E=84=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE,groupName->roleName?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../permissions-editer.component.html         | 78 +++++++++++--------
 .../permissions/permissions.component.html    |  2 -
 .../member-roles-editer.component.html        | 10 +--
 .../member-roles-editer.component.ts          |  4 +-
 .../select-apps/select-apps.component.html    |  2 -
 .../src/assets/app-data.json                  |  2 +-
 .../src/assets/i18n/zh-CN.json                |  2 +-
 .../src/assets/i18n/zh-TW.json                |  2 +-
 8 files changed, 57 insertions(+), 45 deletions(-)

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 a75ba11e7..5e83cd089 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,58 +6,74 @@
         <nz-form-item>
           <nz-form-label nzFor="name">{{ 'mxk.apps.name' | i18n }}</nz-form-label>
           <nz-form-control>
-            <input nz-input [(ngModel)]="query.params.name" [ngModelOptions]="{ standalone: true }" name="name" placeholder="" id="name" />
+            <input nz-input [(ngModel)]="query.params.name" [ngModelOptions]="{ standalone: true }" name="name"
+              placeholder="" id="name" />
           </nz-form-control>
         </nz-form-item>
       </div>
 
       <div nz-col [nzSpan]="query.expandForm ? 24 : 10" [class.text-right]="query.expandForm">
-        <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' | i18n }}</button>
-        <button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' | i18n }}</button>
+        <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' |
+          i18n }}</button>
+        <button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' |
+          i18n }}</button>
         <button nz-button (click)="query.expandForm = !query.expandForm" class="mx-sm" style="display: none">
-          {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button
-        >
+          {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button>
         <button nz-button nzType="primary" (click)="onSubmit($event)">{{ 'mxk.text.confirm' | i18n }}</button>
       </div>
     </div>
   </form>
 
-  <nz-table
-    #dynamicTable
-    nzTableLayout="auto"
-    nzBordered
-    nzShowSizeChanger
-    [nzData]="query.results.rows"
-    [nzFrontPagination]="false"
-    [nzTotal]="query.results.records"
-    [nzPageSizeOptions]="query.params.pageSizeOptions"
-    [nzPageSize]="query.params.pageSize"
-    [nzPageIndex]="query.params.pageNumber"
-    [nzLoading]="this.query.tableLoading"
-    (nzQueryParams)="onQueryParamsChange($event)"
-    nzWidth="100%"
-  >
+  <nz-table #dynamicTable nzTableLayout="auto" nzBordered nzShowSizeChanger [nzData]="query.results.rows"
+    [nzFrontPagination]="false" [nzTotal]="query.results.records" [nzPageSizeOptions]="query.params.pageSizeOptions"
+    [nzPageSize]="query.params.pageSize" [nzPageIndex]="query.params.pageNumber" [nzLoading]="this.query.tableLoading"
+    (nzQueryParams)="onQueryParamsChange($event)" nzWidth="100%">
     <thead>
       <tr>
-        <th [nzChecked]="query.checked" [nzIndeterminate]="query.indeterminate" (nzCheckedChange)="onTableAllChecked($event)"></th>
+        <th [nzChecked]="query.checked" [nzIndeterminate]="query.indeterminate"
+          (nzCheckedChange)="onTableAllChecked($event)"></th>
         <th nzAlign="center" style="display: none">Id</th>
         <th nzAlign="center">{{ 'mxk.apps.icon' | i18n }}</th>
         <th nzAlign="center">{{ 'mxk.apps.name' | i18n }}</th>
-        <th nzAlign="center">{{ 'mxk.apps.protocol' | i18n }}</th>
         <th nzAlign="center">{{ 'mxk.apps.category' | i18n }}</th>
       </tr>
     </thead>
     <tbody>
       <tr *ngFor="let data of query.results.rows">
-        <td
-          [nzChecked]="query.tableCheckedId.has(data.id)"
-          [nzDisabled]="data.disabled"
-          (nzCheckedChange)="onTableItemChecked(data.id, $event)"
-        ></td>
+        <td [nzChecked]="query.tableCheckedId.has(data.id)" [nzDisabled]="data.disabled"
+          (nzCheckedChange)="onTableItemChecked(data.id, $event)"></td>
         <td nzAlign="center"><img height="30" border="0px" src="{{ data.iconBase64 }}" /></td>
-        <td nzAlign="center"> {{ data.name }}</td>
-        <td nzAlign="center"> {{ data.protocol }}</td>
-        <td nzAlign="left">{{ data.category }}</td>
+        <td nzAlign="left"> {{ data.name }}</td>
+        <td nzAlign="left">
+          <div *ngIf="data.category == 'none'">{{ 'mxk.apps.category.none' | i18n }}</div>
+          <div *ngIf="data.category == '1011'">{{ 'mxk.apps.category.1011' | i18n }}</div>
+          <div *ngIf="data.category == '1012'">{{ 'mxk.apps.category.1012' | i18n }}</div>
+          <div *ngIf="data.category == '1013'">{{ 'mxk.apps.category.1013' | i18n }}</div>
+          <div *ngIf="data.category == '1014'">{{ 'mxk.apps.category.1014' | i18n }}</div>
+          <div *ngIf="data.category == '1015'">{{ 'mxk.apps.category.1015' | i18n }}</div>
+          <div *ngIf="data.category == '1016'">{{ 'mxk.apps.category.1016' | i18n }}</div>
+          <div *ngIf="data.category == '1017'">{{ 'mxk.apps.category.1017' | i18n }}</div>
+          <div *ngIf="data.category == '1111'">{{ 'mxk.apps.category.1111' | i18n }}</div>
+          <div *ngIf="data.category == '1112'">{{ 'mxk.apps.category.1112' | i18n }}</div>
+          <div *ngIf="data.category == '1113'">{{ 'mxk.apps.category.1113' | i18n }}</div>
+          <div *ngIf="data.category == '1114'">{{ 'mxk.apps.category.1114' | i18n }}</div>
+          <div *ngIf="data.category == '1211'">{{ 'mxk.apps.category.1211' | i18n }}</div>
+          <div *ngIf="data.category == '1212'">{{ 'mxk.apps.category.1212' | i18n }}</div>
+          <div *ngIf="data.category == '1213'">{{ 'mxk.apps.category.1213' | i18n }}</div>
+          <div *ngIf="data.category == '1214'">{{ 'mxk.apps.category.1214' | i18n }}</div>
+          <div *ngIf="data.category == '1215'">{{ 'mxk.apps.category.1215' | i18n }}</div>
+          <div *ngIf="data.category == '1311'">{{ 'mxk.apps.category.1311' | i18n }}</div>
+          <div *ngIf="data.category == '1411'">{{ 'mxk.apps.category.1411' | i18n }}</div>
+          <div *ngIf="data.category == '1511'">{{ 'mxk.apps.category.1511' | i18n }}</div>
+          <div *ngIf="data.category == '1512'">{{ 'mxk.apps.category.1512' | i18n }}</div>
+          <div *ngIf="data.category == '1611'">{{ 'mxk.apps.category.1611' | i18n }}</div>
+          <div *ngIf="data.category == '1711'">{{ 'mxk.apps.category.1711' | i18n }}</div>
+          <div *ngIf="data.category == '1712'">{{ 'mxk.apps.category.1712' | i18n }}</div>
+          <div *ngIf="data.category == '1811'">{{ 'mxk.apps.category.1811' | i18n }}</div>
+          <div *ngIf="data.category == '1812'">{{ 'mxk.apps.category.1812' | i18n }}</div>
+          <div *ngIf="data.category == '1911'">{{ 'mxk.apps.category.1911' | i18n }}</div>
+          <div *ngIf="data.category == '1912'">{{ 'mxk.apps.category.1912' | i18n }}</div>
+        </td>
       </tr>
     </tbody>
   </nz-table>
@@ -65,4 +81,4 @@
 <div *nzModalFooter style="display: none">
   <button nz-button nzType="default" (click)="onClose($event)">{{ 'mxk.text.close' | i18n }}</button>
   <button nz-button nzType="primary" (click)="onSubmit($event)">{{ 'mxk.text.submit' | i18n }}</button>
-</div>
+</div>
\ No newline at end of file
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 264e2122d..45de573d0 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
@@ -60,7 +60,6 @@
             <th nzAlign="center">{{ 'mxk.roles.name' | i18n }}</th>
             <th nzAlign="center">{{ 'mxk.apps.icon' | i18n }}</th>
             <th nzAlign="center">{{ 'mxk.apps.name' | i18n }}</th>
-            <th nzAlign="center">{{ 'mxk.apps.protocol' | i18n }}</th>
             <th nzAlign="center">{{ 'mxk.apps.category' | i18n }}</th>
             <th nzAlign="center"><a>{{ 'mxk.text.action' | i18n }}</a></th>
           </tr>
@@ -72,7 +71,6 @@
             <td nzAlign="left"> {{ data.roleName }}</td>
             <td nzAlign="center"><img height="30" border="0px" src="{{ data.iconBase64 }}" /></td>
             <td nzAlign="left"> {{ data.name }}</td>
-            <td nzAlign="left"> {{ data.protocol }}</td>
             <td nzAlign="left">
               <div *ngIf="data.category == 'none'">{{ 'mxk.apps.category.none' | i18n }}</div>
               <div *ngIf="data.category == '1011'">{{ 'mxk.apps.category.1011' | i18n }}</div>
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 af14e20b8..de7cadabf 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
@@ -4,10 +4,10 @@
         <div nz-row [nzGutter]="{ xs: 8, sm: 8, md: 8, lg: 24, xl: 48, xxl: 48 }">
             <div nz-col nzMd="14" nzSm="24">
                 <nz-form-item>
-                    <nz-form-label nzFor="name">{{ 'mxk.groups.name' | i18n }}</nz-form-label>
+                    <nz-form-label nzFor="name">{{ 'mxk.roles.name' | i18n }}</nz-form-label>
                     <nz-form-control>
-                        <input nz-input [(ngModel)]="query.params.groupName" [ngModelOptions]="{ standalone: true }"
-                            name="groupName" placeholder="" id="groupName" />
+                        <input nz-input [(ngModel)]="query.params.roleName" [ngModelOptions]="{ standalone: true }"
+                            name="roleName" placeholder="" id="roleName" />
                     </nz-form-control>
                 </nz-form-item>
             </div>
@@ -32,8 +32,8 @@
             <tr>
                 <th></th>
                 <th nzAlign="center" style="display: none">Id</th>
-                <th nzAlign="center">{{ 'mxk.groups.name' | i18n }}</th>
-                <th nzAlign="center">{{ 'mxk.groups.dynamic' | i18n }}</th>
+                <th nzAlign="center">{{ 'mxk.roles.name' | i18n }}</th>
+                <th nzAlign="center">{{ 'mxk.roles.dynamic' | i18n }}</th>
             </tr>
         </thead>
         <tbody>
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 7553bcf51..7dd3b2b7a 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
@@ -35,7 +35,7 @@ export class MemberRolesEditerComponent implements OnInit {
   @Input() username?: String;
   query: {
     params: {
-      groupName: String;
+      roleName: String;
       username: String;
       protocol: String;
       startDate: String;
@@ -58,7 +58,7 @@ export class MemberRolesEditerComponent implements OnInit {
     checked: boolean;
   } = {
       params: {
-        groupName: '',
+        roleName: '',
         username: '',
         protocol: '',
         startDate: '',
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 479a966d1..078eddf20 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
@@ -34,7 +34,6 @@
         <th nzAlign="center" style="display: none">Id</th>
         <th nzAlign="center">{{ 'mxk.apps.icon' | i18n }}</th>
         <th nzAlign="center">{{ 'mxk.apps.name' | i18n }}</th>
-        <th nzAlign="center">{{ 'mxk.apps.protocol' | i18n }}</th>
         <th nzAlign="center">{{ 'mxk.apps.category' | i18n }}</th>
       </tr>
     </thead>
@@ -48,7 +47,6 @@
 
         <td nzAlign="left"><img height="30" border="0px" src="{{ data.iconBase64 }}" /></td>
         <td nzAlign="left"> {{ data.name }}</td>
-        <td nzAlign="left"> {{ data.protocol }}</td>
         <td nzAlign="left">
           <div *ngIf="data.category == 'none'">{{ 'mxk.apps.category.none' | i18n }}</div>
           <div *ngIf="data.category == '1011'">{{ 'mxk.apps.category.1011' | i18n }}</div>
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/app-data.json b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/app-data.json
index cdf800e59..656e65cda 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/app-data.json
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/app-data.json
@@ -104,7 +104,7 @@
           "icon": "anticon-setting",
           "children": [
             {
-              "text": "机构管理",
+              "text": "机构配置",
               "i18n": "mxk.menu.config.institutions",
               "link": "/config/institutions",
               "icon": "anticon-appstore",
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-CN.json b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-CN.json
index e7ca9885e..88a5b0dde 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-CN.json
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-CN.json
@@ -41,7 +41,7 @@
 			"sessions": "会话管理",
 			"config": {
 				"": "配置管理",
-				"institutions": "机构管理",
+				"institutions": "机构配置",
 				"accountsstrategys": "账号策略",
 				"socialsproviders": "社交服务",
 				"synchronizers": "同步器管理",
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-TW.json b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-TW.json
index e81b79e2c..3f872c081 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-TW.json
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-TW.json
@@ -42,7 +42,7 @@
 			"sessions": "會話管理",
 			"config": {
 				"": "配置管理",
-				"institutions": "機構管理",
+				"institutions": "機構配置",
 				"accountsstrategys": "賬號策略",
 				"socialsproviders": "社交服務",
 				"synchronizers": "同步器管理",