Merge 087e4fe into 5390f40

ElemeFE · Nov 5, 2021 · 7afd81c · 7afd81c
2 parents 5390f40 + 087e4fe
commit 7afd81c
Showing 1 changed file with 17 additions and 13 deletions.
diff --git a/packages/date-picker/src/panel/time-range.vue b/packages/date-picker/src/panel/time-range.vue
@@ -163,20 +163,30 @@
 
       handleMinChange(date) {
         this.minDate = clearMilliseconds(date);
-        this.handleChange();
+        if (this.isValidMinValue()) {
+          this.handleChange();
+        }
       },
 
       handleMaxChange(date) {
         this.maxDate = clearMilliseconds(date);
-        this.handleChange();
+        if (this.isValidMaxValue()) {
+          this.handleChange();
+        }
+      },
+
+      isValidMinValue() {
+        return timeWithinRange(this.minDate, this.$refs.minSpinner.selectableRange);
+      },
+
+      isValidMaxValue() {
+        return timeWithinRange(this.maxDate, this.$refs.maxSpinner.selectableRange);
       },
 
       handleChange() {
-        if (this.isValidValue([this.minDate, this.maxDate])) {
-          this.$refs.minSpinner.selectableRange = [[minTimeOfDay(this.minDate), this.maxDate]];
-          this.$refs.maxSpinner.selectableRange = [[this.minDate, maxTimeOfDay(this.maxDate)]];
-          this.$emit('pick', [this.minDate, this.maxDate], true);
-        }
+        this.$refs.minSpinner.selectableRange = [[minTimeOfDay(this.minDate), this.maxDate]];
+        this.$refs.maxSpinner.selectableRange = [[this.minDate, maxTimeOfDay(this.maxDate)]];
+        this.$emit('pick', [this.minDate, this.maxDate], true);
       },
 
       setMinSelectionRange(start, end) {
@@ -217,12 +227,6 @@
         }
       },
 
-      isValidValue(date) {
-        return Array.isArray(date) &&
-          timeWithinRange(this.minDate, this.$refs.minSpinner.selectableRange) &&
-          timeWithinRange(this.maxDate, this.$refs.maxSpinner.selectableRange);
-      },
-
       handleKeydown(event) {
         const keyCode = event.keyCode;
         const mapping = { 38: -1, 40: 1, 37: -1, 39: 1 };