fix(module: calendar): fix calendar timepicker display title error bug (

#444)
NG-ZORRO · May 16, 2019 · f0e6504 · f0e6504
1 parent 4739132
commit f0e6504
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/components/calendar/calendar.component.ts b/components/calendar/calendar.component.ts
@@ -15,7 +15,7 @@ import zhCN from './locale/zh_CN';
 import enUS from './locale/en_US';
 import PropsType from './calendar.props.component';
 import { LocaleProviderService } from '../locale-provider/locale-provider.service';
-import { mergeDateTime } from './util/index';
+import { mergeDateTime, isSameDate } from './util/index';
 import { takeUntil } from 'rxjs/operators';
 import { Subject } from 'rxjs';
 
@@ -278,10 +278,10 @@ export class CalendarComponent implements ControlValueAccessor, OnInit, OnDestro
         } else {
           newState = {
             ...newState,
-            timePickerTitle: +newDate >= +startDate ? locale.selectEndTime : locale.selectStartTime,
+            timePickerTitle: +newDate >= +startDate || isSameDate(startDate, newDate) ? locale.selectEndTime : locale.selectStartTime,
             disConfirmBtn: false,
             endDate:
-              pickTime && !useDateTime && +newDate >= +startDate
+              pickTime && !useDateTime && (+newDate >= +startDate || isSameDate(startDate, newDate))
                 ? new Date(+mergeDateTime(newDate, startDate) + 3600000)
                 : newDate
           };

diff --git a/components/calendar/util/index.ts b/components/calendar/util/index.ts
@@ -34,3 +34,15 @@ export const formatDate = (date: Date, format: string, locale?: Models.Locale) =
   }
   return format;
 };
+
+export const isSameDate = (day_one: Date, day_two: Date) => {
+  if (!day_one || !day_two) {
+    console.error('isSameDate function need two params');
+    return 'need two params';
+  }
+  const compareDate = day_one.getDate() === day_two.getDate();
+  const compareMonth = day_one.getMonth() === day_two.getMonth();
+  const compareYear = day_one.getFullYear() === day_two.getFullYear();
+
+  return compareDate && compareMonth && compareYear;
+};