fix(step-finish): fix validation property [validateForm] not working …

…on step finish.
TemainfoSoftware · Oct 1, 2019 · ef6ac2f · ef6ac2f
1 parent 0781c13
commit ef6ac2f
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/projects/truly-ui/src/components/step/directives/step-finish.directive.ts b/projects/truly-ui/src/components/step/directives/step-finish.directive.ts
@@ -16,6 +16,10 @@ export class StepFinishDirective implements AfterViewInit, OnInit {
 
   @HostListener('click')
   onClick() {
+    if ( !this.stepService.isValidateForm() ) {
+      this.stepService.finish();
+      return;
+    }
     if (this.stepService.isFormValid()) {
       this.stepService.finish();
     }
@@ -36,8 +40,10 @@ export class StepFinishDirective implements AfterViewInit, OnInit {
   }
 
   private setDisabled() {
-    this.button.disabled = !this.stepService.isFormValid();
-    this.change.detectChanges();
+    if ( this.stepService.isValidateForm()) {
+      this.button.disabled = !this.stepService.isFormValid();
+      this.change.detectChanges();
+    }
   }
 
   private changes() {