fix(module: datepicker): add minuteStep support (#479)

NG-ZORRO · Jun 24, 2019 · 246c222 · 246c222
1 parent b0ca5ba
commit 246c222
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/components/date-picker/date-picker.component.spec.ts b/components/date-picker/date-picker.component.spec.ts
@@ -109,6 +109,23 @@ describe('DatePickerComponent', () => {
     datePickerEle.querySelector('.am-picker-popup-header-right').click();
   });
 
+  it('should minuteStep work', () => {
+    component.mode = 'datetime';
+    component.minuteStep = 5;
+    fixture.detectChanges();
+    button.click();
+    fixture.detectChanges();
+    datePickerEle = document.querySelector('datepicker');
+    const contentEles = datePickerEle.querySelectorAll('.am-picker-col-content');
+    const minuteEles = contentEles[contentEles.length - 1].querySelectorAll('.am-picker-col-item');
+    const step =  minuteEles[1].innerText - minuteEles[0].innerText;
+    expect(step).toBe(
+      5,
+      'minuteStep is 5'
+    );
+    datePickerEle.querySelector('.am-picker-popup-header-right').click();
+  });
+
   it('should mode work', () => {
     button.click();
     fixture.detectChanges();
@@ -230,6 +247,7 @@ describe('DatePickerComponent', () => {
       [title]="title"
       [value]="value1"
       [locale]="locale"
+      [minuteStep]="minuteStep"
       class="nzm-button"
       [minDate]="minDate"
       [maxDate]="maxDate"
@@ -329,6 +347,7 @@ export class TestDatePickerBasicComponent {
   value3 = new Date();
   value4 = this.utcNow;
 
+  minuteStep = 1;
   locale = en_US;
   title = 'result';
   mask = true;

diff --git a/components/date-picker/date-picker.component.ts b/components/date-picker/date-picker.component.ts
@@ -546,7 +546,8 @@ export class DatePickerComponent implements OnInit, OnDestroy, AfterViewInit {
 
   initData(tempArr, min, max, str, idx) {
     const dataWithStr = [];
-    for (min; min < max + 1; min++) {
+    const increaseValue = str === this.localeNew.minute ? this.options.minuteStep : 1;
+    for (min; min < max + 1; min += increaseValue) {
       tempArr.push(min);
       dataWithStr.push(min + str);
     }
@@ -678,8 +679,9 @@ export class DatePickerComponent implements OnInit, OnDestroy, AfterViewInit {
     const realIdx = this.indexArray[checkIdx];
     const arr = [];
     let targetLong = 0;
+    const increaseValue = str === this.localeNew.minute ? this.options.minuteStep : 1;
 
-    for (let index = min; index < max + 1; index++) {
+    for (let index = min; index < max + 1; index += increaseValue) {
       arr.push(index);
     }
 

diff --git a/components/date-picker/date-picker.directive.ts b/components/date-picker/date-picker.directive.ts
@@ -45,6 +45,8 @@ export class DatePickerDirective implements OnDestroy, OnChanges, OnInit, Contro
   @Input()
   use12Hours: boolean;
   @Input()
+  minuteStep: number = 1;
+  @Input()
   value: Date = new Date();
   @Input()
   mask: boolean;
@@ -111,6 +113,7 @@ export class DatePickerDirective implements OnDestroy, OnChanges, OnInit, Contro
         'mode',
         'minDate',
         'maxDate',
+        'minuteStep',
         'value',
         'mask',
         'title',