Merge 628badd into 3a25b04

NG-ZORRO · Apr 19, 2021 · a1f11bd · a1f11bd
2 parents 3a25b04 + 628badd
commit a1f11bd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/components/core/time/candy-date.spec.ts b/components/core/time/candy-date.spec.ts
@@ -71,6 +71,14 @@ describe('candy-date coverage supplements', () => {
     expect(result[1]!.getMonth()).toEqual(now.getMonth());
     expect(differenceInCalendarMonths(result[0]!.nativeDate, now)).toEqual(-1);
 
+    result = normalizeRangeValue([new CandyDate(), new CandyDate()], false, 'month', 'left');
+    expect(result[0]!.getMonth()).toEqual(now.getMonth());
+    expect(differenceInCalendarMonths(result[1]!.nativeDate, now)).toEqual(1);
+
+    result = normalizeRangeValue([new CandyDate(), new CandyDate()], false, 'month', 'right');
+    expect(result[0]!.getMonth()).toEqual(now.getMonth());
+    expect(differenceInCalendarMonths(result[1]!.nativeDate, now)).toEqual(1);
+
     result = normalizeRangeValue([new CandyDate(), new CandyDate()], true);
     expect(result[0]!.getMonth()).toEqual(now.getMonth());
     expect(result[1]!.getMonth()).toEqual(now.getMonth());

diff --git a/components/core/time/candy-date.ts b/components/core/time/candy-date.ts
@@ -60,10 +60,14 @@ export function normalizeRangeValue(
     newStart = hasTimePicker ? end : end.add(-1, type);
     newEnd = end;
   } else if (start && end && !hasTimePicker) {
-    if (activePart === 'left') {
+    if (start.isSame(end, type)) {
       newEnd = newStart.add(1, type);
     } else {
-      newStart = newEnd.add(-1, type);
+      if (activePart === 'left') {
+        newEnd = newStart.add(1, type);
+      } else {
+        newStart = newEnd.add(-1, type);
+      }
     }
   }
   return [newStart, newEnd];