Merge branch '250408_park'
All checks were successful
LocalNet_front/pipeline/head This commit looks good
All checks were successful
LocalNet_front/pipeline/head This commit looks good
This commit is contained in:
commit
0f1b3fb4d7
@ -722,6 +722,12 @@
|
|||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.hidden-time-input {
|
||||||
|
position: absolute;
|
||||||
|
opacity: 0;
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
|
||||||
/* 권한부여 */
|
/* 권한부여 */
|
||||||
.user-card-container {
|
.user-card-container {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|||||||
@ -33,9 +33,20 @@
|
|||||||
<span v-if="noInputAlert" class="invalid-feedback d-block" style="padding-left: 5px">{{ noInputAlert }}</span>
|
<span v-if="noInputAlert" class="invalid-feedback d-block" style="padding-left: 5px">{{ noInputAlert }}</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="mb-2">
|
<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
|
<input
|
||||||
|
ref="timeInput"
|
||||||
type="time"
|
type="time"
|
||||||
class="form-control form-control-sm py-1"
|
class="hidden-time-input"
|
||||||
style="height: 25px; font-size: 12px"
|
style="height: 25px; font-size: 12px"
|
||||||
v-model="eventTime"
|
v-model="eventTime"
|
||||||
@input="handleChangeInput2"
|
@input="handleChangeInput2"
|
||||||
@ -81,6 +92,14 @@
|
|||||||
const eventTime = ref('');
|
const eventTime = ref('');
|
||||||
const noInputAlert = ref(null);
|
const noInputAlert = ref(null);
|
||||||
const noInputAlert2 = ref(null);
|
const noInputAlert2 = ref(null);
|
||||||
|
const timeInput = ref(null);
|
||||||
|
|
||||||
|
const focusPicker = () => {
|
||||||
|
if (timeInput.value) {
|
||||||
|
timeInput.value.showPicker(); // 달력 자동 열기 (일부 브라우저에서 지원)
|
||||||
|
timeInput.value.focus(); // 포커스 이동
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const eventTypes = [
|
const eventTypes = [
|
||||||
{ type: 'birthdayParty', code: '300203', title: '생일파티' },
|
{ type: 'birthdayParty', code: '300203', title: '생일파티' },
|
||||||
|
|||||||
@ -543,8 +543,10 @@
|
|||||||
const dateStr = $common.dateFormatter(arg.date, 'YMD');
|
const dateStr = $common.dateFormatter(arg.date, 'YMD');
|
||||||
// 해당 셀의 날짜와 일치하는 데이터
|
// 해당 셀의 날짜와 일치하는 데이터
|
||||||
const theDayWeatherInfo = dailyWeatherList.value.find(weather => weather.date === dateStr);
|
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`;
|
let weatherIconUrl = `https://openweathermap.org/img/wn/${theDayWeatherInfo.icon}.png`;
|
||||||
if (theDayWeatherInfo.icon === '01d' || theDayWeatherInfo.icon === '01n') {
|
if (theDayWeatherInfo.icon === '01d' || theDayWeatherInfo.icon === '01n') {
|
||||||
weatherIconUrl = '/img/icons/sunny-custom.png';
|
weatherIconUrl = '/img/icons/sunny-custom.png';
|
||||||
@ -558,9 +560,8 @@
|
|||||||
weatherEl.style.height = '28px';
|
weatherEl.style.height = '28px';
|
||||||
|
|
||||||
// 해당 셀에 이미지 넣기
|
// 해당 셀에 이미지 넣기
|
||||||
const dayTopEl = arg.el.querySelector('.fc-daygrid-day-top');
|
|
||||||
dayTopEl.classList.add('align-items-center');
|
dayTopEl.classList.add('align-items-center');
|
||||||
dayTopEl.prepend(weatherEl); // 이상하게 가장 앞에 넣어야 일자 뒤에 나옴
|
dayTopEl.prepend(weatherEl); // 이상하게 가장 앞에 넣어야 일자 뒤에 나옴 reverse 옵션이 있는듯
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user