From 463a14c5978ac5d93385ab6660c4542a3c35a40b Mon Sep 17 00:00:00 2001
From: Wilson Zeng <jackzcs@gmail.com>
Date: Thu, 11 Oct 2018 19:38:04 +0800
Subject: [PATCH] fix(module:date-picker): use fixed width when "nzShowTime"
 settled for picker (#2236)

---
 .../date-picker/date-range-picker.component.html  |  2 +-
 .../date-picker/date-range-picker.component.ts    | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/components/date-picker/date-range-picker.component.html b/components/date-picker/date-range-picker.component.html
index 21eda07a6e..89b61e6855 100644
--- a/components/date-picker/date-range-picker.component.html
+++ b/components/date-picker/date-range-picker.component.html
@@ -10,7 +10,7 @@
   [className]="nzClassName"
   [placeholder]="nzPlaceHolder"
   [size]="nzSize"
-  [style]="nzStyle"
+  [style]="pickerStyle"
   (openChange)="onOpenChange($event)"
 >
   <date-range-popup *ngIf="realOpenState"
diff --git a/components/date-picker/date-range-picker.component.ts b/components/date-picker/date-range-picker.component.ts
index bf67e69e8a..250437a2f3 100644
--- a/components/date-picker/date-range-picker.component.ts
+++ b/components/date-picker/date-range-picker.component.ts
@@ -36,6 +36,7 @@ export class DateRangePickerComponent extends AbstractPickerComponent implements
     return !this.isRange && this.nzShowToday;
   }
 
+  pickerStyle: object; // Final picker style that contains width fix corrections etc.
   extraFooter: TemplateRef<void> | string;
 
   constructor(i18n: NzI18nService, private logger: LoggerService) {
@@ -61,6 +62,10 @@ export class DateRangePickerComponent extends AbstractPickerComponent implements
     if (changes.nzRenderExtraFooter) {
       this.extraFooter = valueFunctionProp(this.nzRenderExtraFooter);
     }
+
+    if (changes.nzShowTime || changes.nzStyle) {
+      this.setFixedPickerStyle();
+    }
   }
 
   // If has no timepicker and the user select a date by date panel, then close picker
@@ -93,4 +98,14 @@ export class DateRangePickerComponent extends AbstractPickerComponent implements
   onOpenChange(open: boolean): void {
     this.nzOnOpenChange.emit(open);
   }
+
+  // Setup fixed style for picker
+  private setFixedPickerStyle(): void {
+    const showTimeFixes: { width?: string } = {};
+    if (this.nzShowTime) {
+      showTimeFixes.width = this.isRange ? '350px' : '195px';
+    }
+
+    this.pickerStyle = { ...showTimeFixes, ...this.nzStyle };
+  }
 }