组和角色优化，增加角色动态任务，删除resumeTime和suspendTime

2026-05-14 12:32:09 +08:00 · 2024-09-23 09:52:52 +08:00
parent 0c128ed276
commit 194b8bbe7c
10 changed files with 151 additions and 221 deletions
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Groups.ts
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Groups.ts
@@ -24,13 +24,8 @@ export class Groups extends BaseEntity {
  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'));
-
  constructor() {
    super();
  }
@@ -40,13 +35,6 @@ export class Groups extends BaseEntity {
    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`));
-    }
  }
  override trans(): void {
    if (this.switch_status) {
@@ -54,12 +42,5 @@ export class Groups extends BaseEntity {
    } 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');
-    }
  }
 }
--- 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
@@ -1,19 +1,18 @@
 /*
 * Copyright [2024] [MaxKey of copyright http://www.maxkey.top]
- * 
+ *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
- * 
+ *
 *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
- 

 import format from 'date-fns/format';

@@ -27,11 +26,7 @@ export class Roles extends BaseEntity {
  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'));

  constructor() {
    super();
@@ -45,13 +40,6 @@ export class Roles extends BaseEntity {
    } else {
      this.switch_status = false;
    }
-
-    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 {
@@ -60,11 +48,5 @@ export class Roles extends BaseEntity {
    } 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');
-    }
  }
 }
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/group-editer/group-editer.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/group-editer/group-editer.component.html
@@ -28,30 +28,6 @@
        </nz-radio-group>
      </nz-form-control>
    </nz-form-item>
-    <nz-form-item *ngIf="form.model.category == '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
-          [(ngModel)]="form.model.picker_resumeTime"
-          [ngModelOptions]="{ standalone: true }"
-          nzFormat="HH:mm"
-          name="picker_resumeTime"
-          id="picker_resumeTime"
-        ></nz-time-picker>
-      </nz-form-control>
-    </nz-form-item>
-    <nz-form-item *ngIf="form.model.category == '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
-          [(ngModel)]="form.model.picker_suspendTime"
-          [ngModelOptions]="{ standalone: true }"
-          nzFormat="HH:mm"
-          name="picker_suspendTime"
-          id="picker_suspendTime"
-        ></nz-time-picker>
-      </nz-form-control>
-    </nz-form-item>
    <nz-form-item *ngIf="form.model.category == '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!">
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/roles/role-editer/role-editer.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/roles/role-editer/role-editer.component.html
@@ -4,8 +4,7 @@
    <nz-form-item class="d-none">
      <nz-form-label [nzMd]="6" nzRequired nzFor="id">{{ 'mxk.text.id' | i18n }}</nz-form-label>
      <nz-form-control [nzMd]="18" nzErrorTip="The input is not valid id!">
-        <input [(ngModel)]="form.model.id" disabled="{{ isEdit }}" [ngModelOptions]="{ standalone: true }" nz-input
-          name="id" id="id" />
+        <input [(ngModel)]="form.model.id" disabled="{{ isEdit }}" [ngModelOptions]="{ standalone: true }" nz-input name="id" id="id" />
      </nz-form-control>
    </nz-form-item>
    <nz-form-item>
@@ -19,22 +18,26 @@
    <nz-form-item>
      <nz-form-label [nzMd]="6" nzRequired nzFor="roleCode">{{ 'mxk.text.id' | i18n }}</nz-form-label>
      <nz-form-control [nzMd]="18" nzErrorTip="The input is not valid roleCode!">
-        <input [(ngModel)]="form.model.roleCode" disabled="{{ isEdit }}" [ngModelOptions]="{ standalone: true }"
-          nz-input name="roleCode" id="roleCode" />
+        <input
+          [(ngModel)]="form.model.roleCode"
+          disabled="{{ isEdit }}"
+          [ngModelOptions]="{ standalone: true }"
+          nz-input
+          name="roleCode"
+          id="roleCode"
+        />
      </nz-form-control>
    </nz-form-item>
    <nz-form-item>
      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="name">{{ 'mxk.roles.name' | i18n }}</nz-form-label>
      <nz-form-control [nzSm]="18" [nzMd]="18" [nzXs]="36" [nzXl]="48" nzErrorTip="The input is not valid minLength!">
-        <input [(ngModel)]="form.model.roleName" [ngModelOptions]="{ standalone: true }" nz-input name="roleName"
-          id="roleName" />
+        <input [(ngModel)]="form.model.roleName" [ngModelOptions]="{ standalone: true }" nz-input name="roleName" id="roleName" />
      </nz-form-control>
    </nz-form-item>
    <nz-form-item style="display: none">
      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="name">{{ 'mxk.roles.appId' | i18n }}</nz-form-label>
      <nz-form-control [nzSm]="18" [nzMd]="18" [nzXs]="36" [nzXl]="48" nzErrorTip="The input is not valid minLength!">
-        <input [(ngModel)]="form.model.appId" [ngModelOptions]="{ standalone: true }" nz-input name="roleName"
-          id="roleName" />
+        <input [(ngModel)]="form.model.appId" [ngModelOptions]="{ standalone: true }" nz-input name="roleName" id="roleName" />
      </nz-form-control>
    </nz-form-item>

@@ -48,43 +51,56 @@
        </nz-radio-group>
      </nz-form-control>
    </nz-form-item>
-    <nz-form-item *ngIf="form.model.category == '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 [(ngModel)]="form.model.picker_resumeTime" [ngModelOptions]="{ standalone: true }"
-          nzFormat="HH:mm" name="picker_resumeTime" id="picker_resumeTime"></nz-time-picker>
-      </nz-form-control>
-    </nz-form-item>
-    <nz-form-item *ngIf="form.model.category == '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 [(ngModel)]="form.model.picker_suspendTime" [ngModelOptions]="{ standalone: true }"
-          nzFormat="HH:mm" name="picker_suspendTime" id="picker_suspendTime"></nz-time-picker>
-      </nz-form-control>
-    </nz-form-item>
    <nz-form-item *ngIf="form.model.category == '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 type="hidden" [(ngModel)]="form.model.orgIdsList" [ngModelOptions]="{ standalone: true }" nz-input
-          name="orgIdsList" id="orgIdsList" />
-        <nz-tree-select nzVirtualHeight="300px" [nzMaxTagCount]="3" [(ngModel)]="selectValues"
-          [ngModelOptions]="{ standalone: true }" [nzNodes]="treeNodes.nodes" nzCheckable nzPlaceHolder="Please select"
-          [nzCheckStrictly]="true">
+        <input
+          type="hidden"
+          [(ngModel)]="form.model.orgIdsList"
+          [ngModelOptions]="{ standalone: true }"
+          nz-input
+          name="orgIdsList"
+          id="orgIdsList"
+        />
+        <nz-tree-select
+          nzVirtualHeight="300px"
+          [nzMaxTagCount]="3"
+          [(ngModel)]="selectValues"
+          [ngModelOptions]="{ standalone: true }"
+          [nzNodes]="treeNodes.nodes"
+          nzCheckable
+          nzPlaceHolder="Please select"
+          [nzCheckStrictly]="true"
+        >
        </nz-tree-select>
      </nz-form-control>
    </nz-form-item>
    <nz-form-item *ngIf="form.model.category == '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 rows="4" nz-input [(ngModel)]="form.model.filters" [ngModelOptions]="{ standalone: true }" nz-input
-          name="filters" id="filters"></textarea>
+        <textarea
+          rows="4"
+          nz-input
+          [(ngModel)]="form.model.filters"
+          [ngModelOptions]="{ standalone: true }"
+          nz-input
+          name="filters"
+          id="filters"
+        ></textarea>
      </nz-form-control>
    </nz-form-item>
    <nz-form-item>
      <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="description">{{ 'mxk.text.description' | i18n }}</nz-form-label>
      <nz-form-control [nzSm]="18" [nzXs]="24" nzErrorTip="The input is not valid encoding!">
-        <textarea rows="4" nz-input [(ngModel)]="form.model.description" [ngModelOptions]="{ standalone: true }"
-          nz-input name="description" id="description"></textarea>
+        <textarea
+          rows="4"
+          nz-input
+          [(ngModel)]="form.model.description"
+          [ngModelOptions]="{ standalone: true }"
+          nz-input
+          name="description"
+          id="description"
+        ></textarea>
      </nz-form-control>
    </nz-form-item>
  </form>
@@ -93,4 +109,4 @@
 <div *nzModalFooter>
  <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>