From aaae8f207c68d119d89b6e12b62d5a96105c28ab Mon Sep 17 00:00:00 2001
From: shibanglin <shibanglin@maxsso.net>
Date: Tue, 20 Sep 2022 10:53:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E9=83=A8=E9=97=A8=E5=90=8D=E7=A7=B0=E7=94=B1=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E6=A1=86->=E6=A0=91=E5=BD=A2=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user-editer/user-editer.component.html    | 30 ++++++++++++-------
 .../user-editer/user-editer.component.ts      | 13 ++++++--
 .../src/app/routes/users/users.component.ts   |  2 ++
 3 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/users/user-editer/user-editer.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/users/user-editer/user-editer.component.html
index 5d1f76884..a0824620c 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/users/user-editer/user-editer.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/users/user-editer/user-editer.component.html
@@ -307,20 +307,28 @@
         </div>
         <div nz-row>
           <nz-form-item>
-            <nz-form-label [nzSm]="8" [nzXs]="24" nzFor="departmentId">{{ 'mxk.users.departmentId' | i18n }}
-            </nz-form-label>
+            <nz-form-label [nzSm]="8" [nzXs]="24" nzFor="departmentId">{{ 'mxk.users.departmentId' | i18n }}</nz-form-label>
             <nz-form-control [nzSm]="16" [nzMd]="16" [nzXs]="36" [nzXl]="48"
-              nzErrorTip="The input is not valid departmentId!">
-              <input [(ngModel)]="form.model.departmentId" [ngModelOptions]="{ standalone: true }" nz-input
-                name="departmentId" id="departmentId" />
+                             nzErrorTip="The input is not valid departmentId!">
+              <input [(ngModel)]="form.model.departmentId" [ngModelOptions]="{ standalone: true }" [disabled]="true" nz-input name="departmentId" id="departmentId" />
             </nz-form-control>
           </nz-form-item>
+
           <nz-form-item>
-            <nz-form-label [nzSm]="8" [nzXs]="24" nzFor="department">{{ 'mxk.users.department' | i18n }}</nz-form-label>
-            <nz-form-control [nzSm]="16" [nzMd]="16" [nzXs]="36" [nzXl]="48"
-              nzErrorTip="The input is not valid department!">
-              <input [(ngModel)]="form.model.department" [ngModelOptions]="{ standalone: true }" nz-input
-                name="department" id="department" />
+            <nz-form-label [nzSm]="8" [nzXs]="24" nzFor="departmentId">{{ 'mxk.users.department' | i18n }}
+            </nz-form-label>
+            <nz-form-control [nzSm]="16" [nzMd]="16" [nzXs]="36" [nzXl]="48" nzErrorTip="The input is not valid departmentId!">
+              <!-- <input [(ngModel)]="form.model.departmentId" [ngModelOptions]="{ standalone: true }" nz-input name="departmentId" id="departmentId" />-->
+              <nz-tree-select
+                #orgTree
+                [nzNodes]="orgNodes"
+                nzShowSearch
+                nzPlaceHolder="Please select"
+                [(ngModel)]="form.model.departmentId"
+                [ngModelOptions]="{ standalone: true }"
+                (ngModelChange)="onDeptChange($event)"
+                nzVirtualHeight="300px"
+              ></nz-tree-select>
             </nz-form-control>
           </nz-form-item>
         </div>
@@ -562,4 +570,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>
\ No newline at end of file
+</div>
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 edbca9d2a..3f8d88291 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 } 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';
@@ -27,6 +27,7 @@ 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<string | ArrayBuffer | null> =>
   new Promise((resolve, reject) => {
@@ -66,7 +67,8 @@ export class UserEditerComponent implements OnInit {
   @Input() id?: String;
   @Input() parentNode?: NzTreeNode;
   @Input() isEdit?: boolean;
-
+  @Input() orgNodes!: any[];
+  @ViewChild("orgTree") orgTree!: NzTreeSelectComponent;
   form: {
     submitting: boolean;
     model: Users;
@@ -128,7 +130,12 @@ export class UserEditerComponent implements OnInit {
       }
     }
   }
-
+  onDeptChange(key: string): void {
+    let node = this.orgTree.getTreeNodeByKey(key);
+    if (node){
+      this.form.model.department = node.title
+    }
+  }
   onClose(e: MouseEvent): void {
     e.preventDefault();
     this.modalRef.destroy({ refresh: false });
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 a89b651b4..c1dc33215 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
@@ -183,6 +183,7 @@ export class UsersComponent implements OnInit {
       nzComponentParams: {
         isEdit: false,
         parentNode: this.treeNodes.activated,
+        orgNodes: this.treeNodes.nodes,
         id: ''
       },
       nzWidth: 750,
@@ -204,6 +205,7 @@ export class UsersComponent implements OnInit {
       nzViewContainerRef: this.viewContainerRef,
       nzComponentParams: {
         isEdit: true,
+        orgNodes: this.treeNodes.nodes,
         id: editId
       },
       nzWidth: 750,