From 0f0d6eea9df53238942b86286c6d76203c6fce08 Mon Sep 17 00:00:00 2001
From: mehm8128 <mehm8128@gmail.com>
Date: Thu, 26 Oct 2023 18:56:01 +0900
Subject: [PATCH] =?UTF-8?q?=E6=8C=99=E5=8B=95=E3=83=90=E3=82=B0=E3=81=A3?=
 =?UTF-8?q?=E3=81=A6=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/UI/BaseSelect.vue          | 10 +++----
 src/components/UI/FormProjectDuration.vue | 35 ++++++++++++-----------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/components/UI/BaseSelect.vue b/src/components/UI/BaseSelect.vue
index 3d824d42..288c09f8 100644
--- a/src/components/UI/BaseSelect.vue
+++ b/src/components/UI/BaseSelect.vue
@@ -1,16 +1,16 @@
-<script lang="ts" setup generic="T extends string">
+<script lang="ts" setup>
 import vSelect from 'vue-select'
 import 'vue-select/dist/vue-select.css'
 import { computed } from 'vue'
 import Icon from '/@/components/UI/Icon.vue'
 
 export interface Option {
-  label: T
-  value: T
+  label: string
+  value: string
 }
 
 interface Props {
-  modelValue: T
+  modelValue: string
   options: Option[]
   searchable?: boolean
 }
@@ -18,7 +18,7 @@ interface Props {
 const props = defineProps<Props>()
 
 const emit = defineEmits<{
-  (e: 'update:modelValue', value: T): void
+  (e: 'update:modelValue', value: string): void
 }>()
 
 const value = computed({
diff --git a/src/components/UI/FormProjectDuration.vue b/src/components/UI/FormProjectDuration.vue
index 9bd103ce..f9cdad46 100644
--- a/src/components/UI/FormProjectDuration.vue
+++ b/src/components/UI/FormProjectDuration.vue
@@ -4,7 +4,6 @@ import RequiredChip from '/@/components/UI/RequiredChip.vue'
 import BaseSelect from '/@/components/UI/BaseSelect.vue'
 
 type DurationType = 'since' | 'until'
-type DurationDate = `${number} ${number}`
 
 interface Props {
   modelValue: YearWithSemesterDuration
@@ -18,19 +17,24 @@ const emit = defineEmits<{
 
 const options = Array(20)
   .fill(null)
-  .map((_, i) => ({
-    label: `${(new Date().getFullYear() - i).toString()} ${
-      i % 2 ? '後期' : '前期'
-    }`,
-    value: `${(new Date().getFullYear() - i).toString()} ${
-      i % 2 ? Semester.second.toString() : Semester.first.toString()
-    }`
-  }))
+  .map((_, i) =>
+    Array(2)
+      .fill(null)
+      .map((_, j) => ({
+        label: `${(new Date().getFullYear() - i).toString()} ${
+          j % 2 ? '後期' : '前期'
+        }`,
+        value: `${(new Date().getFullYear() - i).toString()} ${
+          j % 2 ? Semester.second.toString() : Semester.first.toString()
+        }`
+      }))
+  )
+  .flat()
 
-const handleInput = (value: DurationDate, dateType: DurationType) => {
+const handleInput = (value: string, dateType: DurationType) => {
   const parsedDuration = value.split(' ')
-  const [year, semester] = parsedDuration.map(parseInt)
-  if (!year || !semester) return
+  const [year, semester] = parsedDuration.map(v => parseInt(v))
+  if (year === undefined || semester === undefined) return
   const duration: YearWithSemesterDuration = {
     since: {
       year: dateType === 'since' ? year : props.modelValue.since.year,
@@ -76,11 +80,8 @@ const handleInput = (value: DurationDate, dateType: DurationType) => {
             :options="options"
             :class="$style.input"
             :model-value="`${
-              modelValue.until?.year ??
-              new Date().getFullYear()
-            } ${
-              modelValue.until?.semester ?? Semester.first
-            }`"
+              modelValue.until?.year ?? new Date().getFullYear()
+            } ${modelValue.until?.semester ?? Semester.first}`"
             @update:model-value="handleInput($event, 'until')"
           />
         </div>