Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front

src/components/input/FormSelect.vue

@@ -5,11 +5,17 @@
             <span v-if="isEssential" class="link-danger">*</span>
         </label>
         <div :class="isRow ? 'col-md-10' : 'col-md-12'" class="d-flex gap-2 align-items-center">
-            <select class="form-select" :id="name" v-model="selectData" :disabled="disabled" :style="isColor ? { color: selected } : {}" @blur="$emit('blur')">
+            <select v-if="isColor && (!data || data.length === 0)" class="form-select" disabled>
+                <option>사용가능한 컬러가 없습니다</option>
+            </select>
+
+            <!-- 데이터가 있는 경우 원래 select 표시 -->
+            <select v-else class="form-select" :id="name" v-model="selectData" :disabled="disabled" :style="isColor ? { color: selected } : {}" @blur="$emit('blur')">
                 <option v-for="(item, i) in data" :key="i" :value="isCommon ? item.value : i" :style="isColor ? { color: item.label } : {}">
                     {{ isCommon ? item.label : item }}
                 </option>
             </select>
+
             <div v-if="isBtn" class="ms-2">
                     <slot name="append"></slot>
             </div>

src/components/projectlist/ProjectList.vue

@@ -257,7 +257,9 @@
     const formReset = () => {
 
         name.value = '';
-        color.value = colorList.value[0].value;
+        if (colorList.value && colorList.value.length > 0) {
+            color.value = colorList.value[0].value;
+        }
         addressData.value = {
             postcode: '',
             address: '',

src/layouts/TheTop.vue

@@ -21,7 +21,7 @@
 
         <div class="d-flex align-items-center ms-auto" id="navbar-collapse">
             <ul class="navbar-nav flex-row align-items-center ms-auto">
-                <select class="form-select py-1" id="name" v-model="selectedProject" @change="updateSelectedProject">
+                <select class="form-select py-1 cursor-pointer" id="name" v-model="selectedProject" @change="updateSelectedProject">
                     <!-- 내가 참여하고 있는 프로젝트 그룹 -->
                     <option v-for="item in myActiveProjects" :key="item.PROJCTSEQ" :value="item.PROJCTSEQ">
                         {{ item.PROJCTNAM }}