build: fix build error(NG-ZORRO#1513)

kekehaoz · Mar 20, 2019 · ec7a3be · ec7a3be
1 parent 5abaeaa
commit ec7a3be
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/components/time-picker/nz-time-picker-panel.component.ts b/components/time-picker/nz-time-picker-panel.component.ts
@@ -350,7 +350,7 @@ export class NzTimePickerPanelComponent implements ControlValueAccessor, OnInit,
     } else if (unit === 'minute') {
       const disabledMinutes = this.nzDisabledMinutes && this.nzDisabledMinutes(this.time.hours!);
       return this.calcIndex(disabledMinutes, this.minuteRange.map(item => item.index).indexOf(index));
-    } else { // second
+    } else if (unit === 'second') { // second
       const disabledSeconds = this.nzDisabledSeconds && this.nzDisabledSeconds(this.time.hours!, this.time.minutes!);
       return this.calcIndex(disabledSeconds, this.secondRange.map(item => item.index).indexOf(index));
     } else if (unit === '12-hour') {

diff --git a/components/time-picker/time-holder.ts b/components/time-picker/time-holder.ts
@@ -85,7 +85,9 @@ export class TimeHolder {
   }
 
   setValue(value: Date | undefined, use12Hours?: boolean): this {
-    this._use12Hours = use12Hours;
+    if (isNotNil(use12Hours)) {
+      this._use12Hours = use12Hours;
+    }
     this.value = value;
     return this;
   }