瀏覽代碼

fix: the end time of a single event cannot be the same day as the start time

the start time is not 00:00:00
Casper Dai 3 年之前
父節點
當前提交
912f279894
共有 2 個文件被更改,包括 13 次插入7 次删除
  1. 5 3
      src/components/EventPicker/index.vue
  2. 8 4
      src/scss/bem/_ishas.scss

+ 5 - 3
src/components/EventPicker/index.vue

@@ -43,6 +43,7 @@
         v-model="eventOptions.until"
         class="c-event__option"
         type="datetime"
+        popper-class="is-hide-now"
         :disabled="!eventOptions.start"
         placeholder="请选择失效时间"
         value-format="yyyy-MM-dd HH:mm:ss"
@@ -249,11 +250,12 @@ export default {
       if (date < this.minDate) {
         return true
       }
-      if (this.eventOptions.start) {
+      const startDate = this.eventOptions.start
+      if (startDate) {
         if (this.isWeekly) {
-          return date <= new Date(this.eventOptions.start)
+          return date <= new Date(startDate)
         }
-        return date < new Date(this.eventOptions.start)
+        return date < new Date(startDate.replace(/\d{2}:\d{2}:\d{2}$/, '00:00:00'))
       }
       return false
     },

+ 8 - 4
src/scss/bem/_ishas.scss

@@ -33,10 +33,6 @@
   background-repeat: no-repeat;
 }
 
-.is-rotate {
-  transform: rotate(180deg);
-}
-
 .has-border {
   border: 1px solid $info;
 
@@ -44,3 +40,11 @@
     border-radius: 2px;
   }
 }
+
+.is-rotate {
+  transform: rotate(180deg);
+}
+
+.is-hide-now .el-picker-panel__footer .el-button--text {
+  display: none;
+}