From 72120bbe920425f80d3beb08c08af24151246006 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 04 Jan 2018 14:00:46 +0800
Subject: [PATCH] 组织模块
---
src/app/routes/devices/version/version-edit/version-edit.component.ts | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/src/app/routes/devices/version/add-or-edit/add-or-edit.component.ts b/src/app/routes/devices/version/version-edit/version-edit.component.ts
similarity index 74%
rename from src/app/routes/devices/version/add-or-edit/add-or-edit.component.ts
rename to src/app/routes/devices/version/version-edit/version-edit.component.ts
index 4e61d6d..2137673 100644
--- a/src/app/routes/devices/version/add-or-edit/add-or-edit.component.ts
+++ b/src/app/routes/devices/version/version-edit/version-edit.component.ts
@@ -1,16 +1,14 @@
-import { DeviceVersion } from './../version.component';
import { Component, OnInit } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
import { NzMessageService, NzModalSubject } from 'ng-zorro-antd';
-import { DateService } from '@core/services/date.service';
import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { DeviceVersion } from 'app/routes/devices/version/version.component';
@Component({
- selector: 'app-add-or-edit',
- templateUrl: './add-or-edit.component.html',
+ selector: 'app-version-edit',
+ templateUrl: './version-edit.component.html',
styles: []
})
-export class AddOrEditComponent implements OnInit {
+export class VersionEditComponent implements OnInit {
cols: DeviceVersion;
@@ -27,7 +25,7 @@
name: [this.data.name, [Validators.required] ],
version: [this.data.version == null ? 1 : this.data.version, [Validators.required] ],
createTime: [this.data.createTime, [Validators.required] ],
- description: [this.data.description, [Validators.required] ]
+ description: [this.data.description]
};
this.validateForm = this.formBuilder.group(
validates
@@ -53,16 +51,14 @@
return;
}
this.isSaving = true;
- Object.keys(this.data).forEach( (key: string) => {
+ Object.keys(value).forEach( (key: string) => {
if ( value[key] != null ) {
this.data[key] = value[key];
}
} );
this.subject.next( this );
}else {
- for (const i in this.validateForm.controls) {
- this.validateForm.controls[ i ].markAsDirty();
- }
+ this.validate();
}
}
validate() {
--
Gitblit v1.8.0