DatePicker: fix incorrect interaction on range change when defaultTim…

…e provided
ElemeFE · Jan 18, 2018 · 2880132 · 2880132
1 parent 23a60a0
commit 2880132
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 29 deletions.
diff --git a/packages/date-picker/src/panel/date-range.vue b/packages/date-picker/src/panel/date-range.vue
@@ -426,9 +426,8 @@
       },
 
       handleChangeRange(val) {
-        const defaultTime = this.defaultTime || [];
-        this.minDate = modifyWithGivenTime(val.minDate, defaultTime[0]);
-        this.maxDate = modifyWithGivenTime(val.maxDate, defaultTime[1]);
+        this.minDate = val.minDate;
+        this.maxDate = val.maxDate;
         this.rangeState = val.rangeState;
       },
 

diff --git a/test/unit/specs/date-picker.spec.js b/test/unit/specs/date-picker.spec.js
@@ -1272,20 +1272,23 @@ describe('DatePicker', () => {
           triggerEvent(leftCell, 'click', true);
           setTimeout(_ => {
             triggerEvent(rightCell, 'mousemove', true);
-            triggerEvent(rightCell, 'click', true);
-
             setTimeout(_ => {
-              const {
-                minDate,
-                maxDate
-              } = vmWithDefaultTime.picker;
-              expect(minDate.getHours()).to.be.equal(11);
-              expect(minDate.getMinutes()).to.be.equal(59);
-              expect(minDate.getSeconds()).to.be.equal(59);
-              expect(maxDate.getHours()).to.be.equal(0);
-              expect(maxDate.getMinutes()).to.be.equal(0);
-              expect(maxDate.getSeconds()).to.be.equal(0);
-              done();
+              expect(rightCell.classList.contains('in-range')).to.be.true;
+
+              triggerEvent(rightCell, 'click', true);
+              setTimeout(_ => {
+                const {
+                  minDate,
+                  maxDate
+                } = vmWithDefaultTime.picker;
+                expect(minDate.getHours()).to.be.equal(11);
+                expect(minDate.getMinutes()).to.be.equal(59);
+                expect(minDate.getSeconds()).to.be.equal(59);
+                expect(maxDate.getHours()).to.be.equal(0);
+                expect(maxDate.getMinutes()).to.be.equal(0);
+                expect(maxDate.getSeconds()).to.be.equal(0);
+                done();
+              }, DELAY);
             }, DELAY);
           }, DELAY);
         }, DELAY);
@@ -1317,20 +1320,23 @@ describe('DatePicker', () => {
           triggerEvent(leftCell, 'click', true);
           setTimeout(_ => {
             triggerEvent(rightCell, 'mousemove', true);
-            triggerEvent(rightCell, 'click', true);
-
             setTimeout(_ => {
-              const {
-                minDate,
-                maxDate
-              } = vmWithDefaultTime.picker;
-              expect(minDate.getHours()).to.be.equal(11);
-              expect(minDate.getMinutes()).to.be.equal(59);
-              expect(minDate.getSeconds()).to.be.equal(59);
-              expect(maxDate.getHours()).to.be.equal(18);
-              expect(maxDate.getMinutes()).to.be.equal(0);
-              expect(maxDate.getSeconds()).to.be.equal(0);
-              done();
+              expect(rightCell.classList.contains('in-range')).to.be.true;
+
+              triggerEvent(rightCell, 'click', true);
+              setTimeout(_ => {
+                const {
+                  minDate,
+                  maxDate
+                } = vmWithDefaultTime.picker;
+                expect(minDate.getHours()).to.be.equal(11);
+                expect(minDate.getMinutes()).to.be.equal(59);
+                expect(minDate.getSeconds()).to.be.equal(59);
+                expect(maxDate.getHours()).to.be.equal(18);
+                expect(maxDate.getMinutes()).to.be.equal(0);
+                expect(maxDate.getSeconds()).to.be.equal(0);
+                done();
+              }, DELAY);
             }, DELAY);
           }, DELAY);
         }, DELAY);