fix:編集時に日時情報が抜ける問題を修正

traPtitech · Aug 15, 2024 · 969aef2 · 969aef2
1 parent 32726f4
commit 969aef2
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 5 deletions.
diff --git a/src/components/event/EventFormTimeAndPlaceInstant.vue b/src/components/event/EventFormTimeAndPlaceInstant.vue
@@ -69,10 +69,17 @@ export default class EventFormTimeAndPlaceInstant extends Vue {
   @Prop({ type: Boolean, required: true })
   value!: boolean
 
-  private dateStartMem = ''
-  private dateEndMem = ''
-  private timeStartMem = ''
-  private timeEndMem = ''
+  public dateStartMem = ''
+  public dateEndMem = ''
+  public timeStartMem = ''
+  public timeEndMem = ''
+
+  created() {
+    this.dateStartMem = this.timeStartInput && getDate(this.timeStartInput)
+    this.dateEndMem = this.timeEndInput && getDate(this.timeEndInput)
+    this.timeStartMem = this.timeStartInput && getTime(this.timeStartInput)
+    this.timeEndMem = this.timeEndInput && getTime(this.timeEndInput)
+  }
 
   @Ref()
   readonly form!: { validate(): void }
@@ -95,7 +102,7 @@ export default class EventFormTimeAndPlaceInstant extends Vue {
     }
   }
 
-  private setDefaultDateEnd() {
+  public setDefaultDateEnd() {
     if (!this.dateEndMem) this.dateEndMem = this.dateStartMem
   }
 

diff --git a/src/workers/rules.ts b/src/workers/rules.ts
@@ -60,6 +60,21 @@ const rules = {
       startTime < endTime ||
       '終了日時が開始日時よりも遅くなるようにしてください',
   ],
+  eventTimeInstant2: (
+    startDate: string,
+    startTime: string,
+    endDate: string,
+    endTime: string
+  ) => [
+    () =>
+      !startDate ||
+      !startTime ||
+      !endDate ||
+      !endTime ||
+      new Date(startDate + 'T' + startTime) <
+        new Date(endDate + 'T' + endTime) ||
+      '終了日時が開始日時よりも遅くなるようにしてください',
+  ],
 }
 
 export default rules