fix(module:date-picker): select date but nzDefaultOpenValue not work (#…

…4490)
NG-ZORRO · Dec 2, 2019 · 2397819 · 2397819
1 parent d96ebe0
commit 2397819
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 8 deletions.
diff --git a/components/core/time/candy-date.ts b/components/core/time/candy-date.ts
@@ -129,9 +129,7 @@ export class CandyDate implements IndexableObject {
   }
 
   setHms(hour: number, minute: number, second: number): CandyDate {
-    const date = new Date(this.nativeDate);
-    date.setHours(hour, minute, second);
-    return new CandyDate(date);
+    return new CandyDate(this.nativeDate.setHours(hour, minute, second));
   }
 
   setYear(year: number): CandyDate {

diff --git a/components/date-picker/lib/popups/inner-popup.component.html b/components/date-picker/lib/popups/inner-popup.component.html
@@ -36,7 +36,6 @@
     [showWeek]="showWeek"
     [value]="value"
     (valueChange)="onSelectDate($event)"
-    showWeekNumber="false"
     [disabledDate]="disabledDate"
     [dateCellRender]="dateRender"
     [selectedValue]="selectedValue"

diff --git a/components/date-picker/lib/popups/inner-popup.component.ts b/components/date-picker/lib/popups/inner-popup.component.ts
@@ -18,7 +18,7 @@ import {
 
 import { CandyDate, FunctionProp } from 'ng-zorro-antd/core';
 import { NzCalendarI18nInterface } from 'ng-zorro-antd/i18n';
-import { DisabledDateFn, PanelMode } from '../../standard-types';
+import { DisabledDateFn, PanelMode, SupportTimeOptions } from '../../standard-types';
 
 @Component({
   encapsulation: ViewEncapsulation.None,
@@ -33,8 +33,7 @@ export class InnerPopupComponent {
 
   @Input() locale: NzCalendarI18nInterface;
   @Input() showTimePicker: boolean;
-  // tslint:disable-next-line:no-any
-  @Input() timeOptions: any;
+  @Input() timeOptions: SupportTimeOptions;
   @Input() enablePrev: boolean;
   @Input() enableNext: boolean;
   @Input() disabledDate: DisabledDateFn;
@@ -61,6 +60,13 @@ export class InnerPopupComponent {
   // The value real changed to outside
   onSelectDate(date: CandyDate | Date): void {
     const value = date instanceof CandyDate ? date : new CandyDate(date);
+    const timeValue = this.timeOptions && this.timeOptions.nzDefaultOpenValue;
+
+    // Display timeValue when value is null
+    if (!this.value && timeValue) {
+      value.setHms(timeValue.getHours(), timeValue.getMinutes(), timeValue.getSeconds());
+    }
+
     this.selectDate.emit(value);
   }
 }
diff --git a/components/date-picker/nz-date-picker.component.spec.ts b/components/date-picker/nz-date-picker.component.spec.ts
@@ -649,6 +649,12 @@ describe('NzDatePickerComponent', () => {
       fixture.detectChanges();
       openPickerByClickTrigger();
 
+      dispatchMouseEvent(getFirstCell(), 'click');
+      fixture.detectChanges();
+      tick(500);
+      fixture.detectChanges();
+      expect((queryFromOverlay('input.ant-calendar-input') as HTMLInputElement).value).toContain('00:01:02');
+
       // Open time picker panel
       dispatchMouseEvent(queryFromOverlay('.ant-calendar-time-picker-btn'), 'click');
       fixture.detectChanges();
@@ -668,7 +674,7 @@ describe('NzDatePickerComponent', () => {
       fixture.detectChanges();
       openPickerByClickTrigger();
 
-      dispatchMouseEvent(queryFromOverlay('.ant-calendar-cell > .ant-calendar-date'), 'click');
+      dispatchMouseEvent(getFirstCell(), 'click');
 
       fixture.detectChanges();
       flush();

diff --git a/components/date-picker/standard-types.ts b/components/date-picker/standard-types.ts
@@ -50,6 +50,7 @@ export interface SupportTimeOptions {
   nzHideDisabledOptions?: boolean;
   nzDefaultOpenValue?: Date;
   nzAddOn?: TemplateRef<void>;
+  nzUse12Hours?: boolean;
 }
 
 export interface PresetRanges {