From b0ccea0ac085bb475f25e9569e8f199e234097ab Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Thu, 20 Oct 2022 08:52:51 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E7=BC=96=E8=BE=91=E9=A2=84?=
 =?UTF-8?q?=E6=A1=88=E5=BC=B9=E7=AA=97=E6=97=A0=E6=B3=95=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/left-domain/left-domain.component.html |  8 ++++----
 .../pages/left-domain/left-domain.component.ts   | 16 +++++++++++++++-
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/app/pages/left-domain/left-domain.component.html b/src/app/pages/left-domain/left-domain.component.html
index 1f494f7..e9bf05e 100644
--- a/src/app/pages/left-domain/left-domain.component.html
+++ b/src/app/pages/left-domain/left-domain.component.html
@@ -343,19 +343,19 @@
 
     </nz-modal>
     <nz-modal [(nzVisible)]="editSelectDisposal" nzTitle="编辑预案名称">
-      <ng-container *nzModalContent>
-        <form nz-form #editForm='ngForm'>
+      <ng-container>
+        <form nz-form #editForm='ngForm' *nzModalContent [formGroup]="validateForm3">
           <nz-form-item>
             <nz-form-label [nzSpan]="6">预案名称</nz-form-label>
             <nz-form-control [nzSpan]="18" nzErrorTip="请输入必填项">
-              <input nz-input #name='ngModel' [(ngModel)]="editDisposalName" name="name" required />
+              <input formControlName="name" nz-input [(ngModel)]="editDisposalName" name="name" required />
             </nz-form-control>
           </nz-form-item>
         </form>
         <div *nzModalFooter>
           <button nz-button nzType="primary" (click)="saveMould()" *ngIf="userMode">保存为模板</button>
           <button nz-button nzType="default" (click)="editSelectDisposal = null;">取消</button>
-          <button nz-button nzType="primary" (click)="editDisposal(editForm.value)">确定</button>
+          <button nz-button nzType="primary" (click)="editDisposal()">确定</button>
         </div>
       </ng-container>
     </nz-modal>
diff --git a/src/app/pages/left-domain/left-domain.component.ts b/src/app/pages/left-domain/left-domain.component.ts
index e241d04..34d524f 100644
--- a/src/app/pages/left-domain/left-domain.component.ts
+++ b/src/app/pages/left-domain/left-domain.component.ts
@@ -29,6 +29,7 @@ export class LeftDomainComponent implements OnInit {
   constructor(private message: NzMessageService, private element: ElementRef, private http: HttpClient, private cd: ChangeDetectorRef, private fb: FormBuilder) { }
   validateForm!: FormGroup;
   validateForm2!: FormGroup;
+  validateForm3!: FormGroup;
   ngOnInit(): void {
     this.validateForm = this.fb.group({
       name: [null, [Validators.required]],
@@ -41,6 +42,10 @@ export class LeftDomainComponent implements OnInit {
       node: [null, [Validators.required]]
     });
 
+    this.validateForm3 = this.fb.group({
+      name: [null, [Validators.required]]
+    });
+
     this.editMode = PlanComponent.instance.editMode
     this.initComponent()
   }
@@ -402,7 +407,16 @@ export class LeftDomainComponent implements OnInit {
   }
 
   //编辑预案名称
-  editDisposal(e) {
+  editDisposal() {
+
+
+    if (!this.validateForm3.valid) {
+      this.message.create('warning', '请填写完整！');
+      return
+    }
+
+    let e = this.validateForm3.value
+
     this.editSelectDisposal.name = e.name
     this.editSelectDisposal = null
   }