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

public/css/custom.css

@@ -722,6 +722,12 @@
     pointer-events: none;
 }
 
+.hidden-time-input {
+    position: absolute;
+    opacity: 0;
+    pointer-events: none;
+}
+
 /* 권한부여 */
 .user-card-container {
     display: flex;

src/components/main/EventModal.vue

@@ -33,9 +33,20 @@
                 <span v-if="noInputAlert" class="invalid-feedback d-block" style="padding-left: 5px">{{ noInputAlert }}</span>
             </div>
             <div class="mb-2">
+                <div @click="focusPicker">
+                    <input
+                        type="time"
+                        class="form-control form-control-sm py-1"
+                        style="height: 25px; font-size: 12px"
+                        v-model="eventTime"
+                        @input="handleChangeInput2"
+                    />
+                </div>
+
                 <input
+                    ref="timeInput"
                     type="time"
-                    class="form-control form-control-sm py-1"
+                    class="hidden-time-input"
                     style="height: 25px; font-size: 12px"
                     v-model="eventTime"
                     @input="handleChangeInput2"
@@ -81,6 +92,14 @@
     const eventTime = ref('');
     const noInputAlert = ref(null);
     const noInputAlert2 = ref(null);
+    const timeInput = ref(null);
+
+    const focusPicker = () => {
+        if (timeInput.value) {
+            timeInput.value.showPicker(); // 달력 자동 열기 (일부 브라우저에서 지원)
+            timeInput.value.focus(); // 포커스 이동
+        }
+    };
 
     const eventTypes = [
         { type: 'birthdayParty', code: '300203', title: '생일파티' },

src/components/main/MainEventCalendar.vue

@@ -543,8 +543,10 @@
         const dateStr = $common.dateFormatter(arg.date, 'YMD');
         // 해당 셀의 날짜와 일치하는 데이터
         const theDayWeatherInfo = dailyWeatherList.value.find(weather => weather.date === dateStr);
+        const dayTopEl = arg.el.querySelector('.fc-daygrid-day-top');
+        const isWeatherInfoExist = dayTopEl.getElementsByClassName('weather-icon').length > 0; // 중복 방지
 
-        if (theDayWeatherInfo) {
+        if (theDayWeatherInfo && !isWeatherInfoExist) {
             let weatherIconUrl = `https://openweathermap.org/img/wn/${theDayWeatherInfo.icon}.png`;
             if (theDayWeatherInfo.icon === '01d' || theDayWeatherInfo.icon === '01n') {
                 weatherIconUrl = '/img/icons/sunny-custom.png';
@@ -558,9 +560,8 @@
             weatherEl.style.height = '28px';
 
             // 해당 셀에 이미지 넣기
-            const dayTopEl = arg.el.querySelector('.fc-daygrid-day-top');
             dayTopEl.classList.add('align-items-center');
-            dayTopEl.prepend(weatherEl); // 이상하게 가장 앞에 넣어야 일자 뒤에 나옴
+            dayTopEl.prepend(weatherEl); // 이상하게 가장 앞에 넣어야 일자 뒤에 나옴 reverse 옵션이 있는듯
         }
     };
 

src/components/wordDict/DictWrite.vue

@@ -49,7 +49,7 @@
             @keyup="ValidHandler('title')"
         />
         <div>
-                <QEditor   class="q-editor-container"  @keyup="ValidHandler('content')"  @update:data="handleContentUpdate" @update:imageUrls="imageUrls = $event"  :is-alert="wordContentAlert" :initialData="contentValue"/>
+            <QEditor   class="q-editor-container"  @keyup="ValidHandler('content')"  @update:data="handleContentUpdate" @update:imageUrls="imageUrls = $event"  :is-alert="wordContentAlert" :initialData="contentValue"/>
             <div class="text-end mt-5">
                 <button class="btn btn-primary" @click="saveWord" :disabled="titleValue ? !changed : false">
                     <i class="bx bx-check"></i>

src/views/wordDict/wordDict.vue

@@ -333,11 +333,10 @@ import { useRoute } from 'vue-router';
 }
 
 .q-editor-container {
-    max-width: 100%;
-    overflow: hidden;
-    text-overflow: ellipsis; /* 긴 내용이면 말줄임표 처리도 가능 */
-    word-break: break-word;
-    white-space: normal;
+    max-width: 100%; /* 영역이 넘치지 않게 */
+    overflow: auto; /* 넘치는 내용은 스크롤로 처리 */
+    word-wrap: break-word; /* 긴 단어는 자동으로 줄바꿈 */
+    white-space: normal; /* 내용이 길어지면 자동으로 줄바꿈 */
 }
 
 </style>