dynamic Groups and Roles

maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/group-members/group-members.component.html

@@ -76,6 +76,7 @@
         <thead>
           <tr>
             <th [nzChecked]="query.checked" [nzIndeterminate]="query.indeterminate" (nzCheckedChange)="onTableAllChecked($event)"></th>
+            <th nzAlign="center">{{ 'mxk.groups.name' | i18n }}</th>
             <th nzAlign="center">{{ 'mxk.users.username' | i18n }}</th>
             <th nzAlign="center">{{ 'mxk.users.displayName' | i18n }}</th>
             <th nzAlign="center">{{ 'mxk.users.employeeNumber' | i18n }}</th>
@@ -94,6 +95,7 @@
               [nzDisabled]="data.disabled"
               (nzCheckedChange)="onTableItemChecked(data.id, $event)"
             ></td>
+            <td nzAlign="center"> {{ data.groupName }}</td>
             <td nzAlign="center"> {{ data.username }}</td>
             <td nzAlign="center"> {{ data.displayName }}</td>
             <td nzAlign="center"> {{ data.employeeNumber }}</td>
@@ -102,9 +104,15 @@
             <td nzAlign="center"> {{ data.gender == 1 ? ('mxk.users.gender.female' | i18n) : ('mxk.users.gender.male' | i18n) }}</td>
             <td nzAlign="left" nzBreakWord="false"
               ><div nz-col>
-                <button nz-button type="button" (click)="onDelete($event, data.id)" [nzType]="'primary'" nzDanger>{{
-                  'mxk.text.delete' | i18n
-                }}</button></div
+                <button
+                  *ngIf="data.dynamic == '0'"
+                  nz-button
+                  type="button"
+                  (click)="onDelete($event, data.id)"
+                  [nzType]="'primary'"
+                  nzDanger
+                  >{{ 'mxk.text.delete' | i18n }}</button
+                ></div
               ></td
             >
           </tr>

maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/groups/group-editer/group-editer.component.html

@@ -27,7 +27,7 @@
         <ng-template #unCheckedTemplate><i nz-icon nzType="close"></i></ng-template>
       </nz-form-control>
     </nz-form-item>
-    <nz-form-item>
+    <nz-form-item *ngIf="form.model.switch_dynamic">
       <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="resumeTime">{{ 'mxk.groups.resumeTime' | i18n }}</nz-form-label>
       <nz-form-control [nzSm]="18" [nzXs]="24" nzErrorTip="The input is not valid port!">
         <nz-time-picker
@@ -39,7 +39,7 @@
         ></nz-time-picker>
       </nz-form-control>
     </nz-form-item>
-    <nz-form-item>
+    <nz-form-item *ngIf="form.model.switch_dynamic">
       <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="suspendTime">{{ 'mxk.groups.suspendTime' | i18n }}</nz-form-label>
       <nz-form-control [nzSm]="18" [nzXs]="24" nzErrorTip="The input is not valid suspendTime!">
         <nz-time-picker
@@ -51,13 +51,13 @@
         ></nz-time-picker>
       </nz-form-control>
     </nz-form-item>
-    <nz-form-item>
+    <nz-form-item *ngIf="form.model.switch_dynamic">
       <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="orgIdsList">{{ 'mxk.groups.orgIdsList' | i18n }}</nz-form-label>
       <nz-form-control [nzSm]="18" [nzXs]="24" nzErrorTip="The input is not valid upperCase!">
         <input [(ngModel)]="form.model.orgIdsList" [ngModelOptions]="{ standalone: true }" nz-input name="orgIdsList" id="orgIdsList" />
       </nz-form-control>
     </nz-form-item>
-    <nz-form-item>
+    <nz-form-item *ngIf="form.model.switch_dynamic">
       <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="filters">{{ 'mxk.groups.filters' | i18n }}</nz-form-label>
       <nz-form-control [nzSm]="18" [nzXs]="24" nzErrorTip="The input is not valid filters!">
         <textarea

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

@@ -76,6 +76,7 @@
         <thead>
           <tr>
             <th [nzChecked]="query.checked" [nzIndeterminate]="query.indeterminate" (nzCheckedChange)="onTableAllChecked($event)"></th>
+            <th nzAlign="center">{{ 'mxk.roles.name' | i18n }}</th>
             <th nzAlign="center">{{ 'mxk.users.username' | i18n }}</th>
             <th nzAlign="center">{{ 'mxk.users.displayName' | i18n }}</th>
             <th nzAlign="center">{{ 'mxk.users.employeeNumber' | i18n }}</th>
@@ -94,6 +95,7 @@
               [nzDisabled]="data.disabled"
               (nzCheckedChange)="onTableItemChecked(data.id, $event)"
             ></td>
+            <td nzAlign="center"> {{ data.roleName }}</td>
             <td nzAlign="center"> {{ data.username }}</td>
             <td nzAlign="center"> {{ data.displayName }}</td>
             <td nzAlign="center"> {{ data.employeeNumber }}</td>
@@ -102,9 +104,15 @@
             <td nzAlign="center"> {{ data.gender == 1 ? ('mxk.users.gender.female' | i18n) : ('mxk.users.gender.male' | i18n) }}</td>
             <td nzAlign="left" nzBreakWord="false"
               ><div nz-col>
-                <button nz-button type="button" (click)="onDelete($event, data.id)" [nzType]="'primary'" nzDanger>{{
-                  'mxk.text.delete' | i18n
-                }}</button></div
+                <button
+                  *ngIf="data.dynamic == '0'"
+                  nz-button
+                  type="button"
+                  (click)="onDelete($event, data.id)"
+                  [nzType]="'primary'"
+                  nzDanger
+                  >{{ 'mxk.text.delete' | i18n }}</button
+                ></div
               ></td
             >
           </tr>

maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/roles/role-editer/role-editer.component.html

@@ -27,7 +27,7 @@
         <ng-template #unCheckedTemplate><i nz-icon nzType="close"></i></ng-template>
       </nz-form-control>
     </nz-form-item>
-    <nz-form-item>
+    <nz-form-item *ngIf="form.model.switch_dynamic">
       <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="resumeTime">{{ 'mxk.roles.resumeTime' | i18n }}</nz-form-label>
       <nz-form-control [nzSm]="18" [nzXs]="24" nzErrorTip="The input is not valid port!">
         <nz-time-picker
@@ -39,7 +39,7 @@
         ></nz-time-picker>
       </nz-form-control>
     </nz-form-item>
-    <nz-form-item>
+    <nz-form-item *ngIf="form.model.switch_dynamic">
       <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="suspendTime">{{ 'mxk.roles.suspendTime' | i18n }}</nz-form-label>
       <nz-form-control [nzSm]="18" [nzXs]="24" nzErrorTip="The input is not valid suspendTime!">
         <nz-time-picker
@@ -51,13 +51,13 @@
         ></nz-time-picker>
       </nz-form-control>
     </nz-form-item>
-    <nz-form-item>
+    <nz-form-item *ngIf="form.model.switch_dynamic">
       <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="orgIdsList">{{ 'mxk.roles.orgIdsList' | i18n }}</nz-form-label>
       <nz-form-control [nzSm]="18" [nzXs]="24" nzErrorTip="The input is not valid upperCase!">
         <input [(ngModel)]="form.model.orgIdsList" [ngModelOptions]="{ standalone: true }" nz-input name="orgIdsList" id="orgIdsList" />
       </nz-form-control>
     </nz-form-item>
-    <nz-form-item>
+    <nz-form-item *ngIf="form.model.switch_dynamic">
       <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="filters">{{ 'mxk.roles.filters' | i18n }}</nz-form-label>
       <nz-form-control [nzSm]="18" [nzXs]="24" nzErrorTip="The input is not valid filters!">
         <textarea