Merge remote-tracking branch 'origin/develop' into develop

沈斌

2018-03-13 9c9b8250b973eea72f6970e1ceb46facca9f0a99

 src/app/routes/devices/version/version-edit/version-edit.component.ts

@@ -1,7 +1,7 @@
import { DeviceVersion } from '@business/entity/data';
import { Component, OnInit } from '@angular/core';
import { NzMessageService, NzModalSubject } from 'ng-zorro-antd';
import { FormGroup, FormBuilder, Validators } from '@angular/forms';
import { DeviceVersion } from 'app/routes/devices/version/version.component';

@Component({
  selector: 'app-version-edit',
@@ -21,6 +21,9 @@
    ) { }

  ngOnInit() {
     if (this.data.createTime == null) {
      this.data.createTime = new Date().getTime();
     }
     const validates: DeviceVersion = {
          name: [this.data.name, [Validators.required] ],
          version: [this.data.version == null ? 1 : this.data.version, [Validators.required] ],
@@ -57,7 +60,7 @@
              }
        } );
        this.subject.next( this );
      }else {
      } else {
        this.validate(); 
      }
  }