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

2025-03-28 01:10:20 +09:00 · 2025-03-28 01:10:20 +09:00 · 4a8f74c357
commit 4a8f74c357
parent de04cf679b 4395be2e90
16 changed files with 154 additions and 77 deletions
--- a/public/css/custom.css
+++ b/public/css/custom.css
@ -233,7 +233,7 @@
    position: relative;
 }
 .vac-modal-body {
-    max-height: 230px;
+    max-height: 180px;
    overflow-y: auto;
 }
 .vac-modal-text {
--- a/public/css/font.css
+++ b/public/css/font.css
@ -152,7 +152,7 @@ body {
 /* Consolas 폰트 */
@font-face {
    font-family: 'Consolas';
-    src: url('/font/Consolas.woff') format('woff');
+    src: url('/font/Consolas.woff') format('font-woff');
    font-weight: normal;
    font-style: normal;
 }
--- a/src/components/board/BoardProfile.vue
+++ b/src/components/board/BoardProfile.vue
@ -17,7 +17,7 @@
                    <span>{{ date }}</span>
                    <template v-if="showDetail">
                        <span class="ms-2"> <i class="fa-regular fa-eye"></i> {{ views }} </span>
-                        <span class="ms-1"> <i class="bx bx-comment"></i> {{ commentNum }} </span>
+                        <span v-if="unknown" class="ms-1"> <i class="bx bx-comment"></i> {{ commentNum }} </span>
                    </template>
                </div>
            </div>
--- a/src/components/commuters/CommuterBtn.vue
+++ b/src/components/commuters/CommuterBtn.vue
@ -13,11 +13,13 @@

        <div class="col-6 ps-1">
            <button
-            class="btn btn-outline-secondary border-3 w-100 py-0 h-px-50"
+            class="btn border-3 w-100 py-0 h-px-50"
+            :class="!workTime ? 'btn-outline-secondary pe-none disabled' : 'btn-outline-secondary'"
            @click="setLeaveTime"
+            :disabled="!workTime"
            >
-            <i v-if="!leaveTime" class='bx bxs-door-open fs-2'></i>
-            <span v-if="leaveTime" class="ql-size-12px">{{ leaveTime }}</span>
+                <i v-if="!leaveTime" class='bx bxs-door-open fs-2'></i>
+                <span v-if="leaveTime" class="ql-size-12px">{{ leaveTime }}</span>
            </button>
        </div>
    </div>
@ -36,10 +38,14 @@ const props = defineProps({
    checkedInProject: {
        type: Object,
        required: false
+    },
+    pendingProjectChange: {
+        type: Object,
+        default: null
    }
 });

-const emit = defineEmits(['workTimeUpdated', 'leaveTimeUpdated']);
+const emit = defineEmits(['workTimeUpdated', 'leaveTimeUpdated', 'projectChangeComplete']);

 const workTime = ref(null);
 const leaveTime  = ref(null)
@ -128,7 +134,7 @@ const setWorkTime = async () => {
    $api.post('commuters/insert', {
        memberSeq: props.userId,
        projctSeq: props.checkedInProject.PROJCTSEQ,
-        commutLvt: null,
+        commutLve: null,
        commutArr: address,
    }).then(res => {
        if (res.status === 200) {
@ -144,11 +150,11 @@ const setLeaveTime = () => {
    $api.patch('commuters/updateLve', {
        memberSeq: props.userId,
        commutLve: leaveTime.value || null,
+        projctLve: props.pendingProjectChange ? props.pendingProjectChange.projctSeq : props.checkedInProject.PROJCTSEQ
    }).then(res => {
        if (res.status === 200) {
            todayCommuterInfo();
-            // 부모 컴포넌트에 업데이트 이벤트 발생
-            emit('leaveTimeUpdated', true);
+            emit('leaveTimeUpdated');
        }
    });
 };
--- a/src/components/commuters/CommuterCalendar.vue
+++ b/src/components/commuters/CommuterCalendar.vue
@ -12,6 +12,7 @@
                        <CommuterBtn
                            :userId="user.id"
                            :checkedInProject="checkedInProject || {}"
+                            :pendingProjectChange="pendingProjectChange"
                            @workTimeUpdated="handleWorkTimeUpdate"
                            @leaveTimeUpdated="handleLeaveTimeUpdate"
                            ref="workTimeComponentRef"
@ -50,7 +51,7 @@

    <CenterModal :display="isModalOpen" @close="closeModal">
        <template #title>
-                {{ eventDate }}
+            {{ eventDate }}
        </template>
        <template #body>
            <div v-if="selectedDateCommuters.length > 0">
@ -60,10 +61,23 @@
                        class="rounded-circle me-2 w-px-50 h-px-50"
                        @error="$event.target.src = '/img/icons/icon.png'">

-                        <span class="text-white fw-bold rounded py-1 px-3" :style="`background: ${commuter.projctcolor} !important;`">{{ commuter.memberName }}</span>
+                        <span class="fw-bold">{{ commuter.memberName }}</span>

                        <div class="ms-auto text-start fw-bold">
-                            {{ commuter.COMMUTCMT }} ~ {{ commuter.COMMUTLVE || "00:00:00" }}
+                            <div class="d-flex gap-1 align-items-center ">
+                                출근 :
+                                <div class="text-white rounded px-2" :style="`background: ${commuter.projctcolor} !important;`">
+                                    {{ commuter.PROJCTNAM }}
+                                </div>
+                                ({{ commuter.COMMUTCMT }})
+                            </div>
+                            <div v-if="commuter.PROJCTLVE" class="d-flex gap-1 mt-1">
+                                퇴근 :
+                                <div class="text-white rounded px-2" :style="`background: ${commuter.leaveProjectColor} !important;`">
+                                    {{ commuter.leaveProjectName }}
+                                </div>
+                                ({{ commuter.COMMUTLVE || "00:00:00" }})
+                            </div>
                        </div>
                    </div>
                </div>
@ -73,6 +87,7 @@
            <BackBtn @click="closeModal" />
        </template>
    </CenterModal>
+
 </template>

 <script setup>
@ -116,6 +131,9 @@ const monthlyCommuters = ref([]);

 const calendarDatepicker = ref(null);

+const pendingProjectChange = ref(null);
+
+
 // 출퇴근 컴포넌트 이벤트 핸들러
 const handleWorkTimeUpdate = () => {
    todaysCommuter();
@ -126,32 +144,41 @@ const handleLeaveTimeUpdate = () => {
    todaysCommuter();
 };

+const handleResetProjectState = () => {
+    // 이전에 체크인했던 프로젝트로 복귀
+    const storedProject = projectStore.getSelectedProject();
+    if (storedProject) {
+        checkedInProject.value = storedProject;
+        selectedProject.value = storedProject.PROJCTSEQ;
+        projectStore.setSelectedProject(storedProject);
+        pendingProjectChange.value = null;
+    }
+};
+
 // 프로젝트 드롭 이벤트 핸들러 (ProjectList 컴포넌트에서 전달받음)
 const handleProjectDrop = ({ event, targetProject }) => {
-    // 드래그된 프로젝트 데이터 가져오기
    const draggedProjectData = JSON.parse(event.dataTransfer.getData('application/json'));

-    // 드래그한 프로젝트와 드롭한 프로젝트가 같으면 아무 동작 안 함
+    // 기존 프로젝트와 동일한 경우 변경 안 함
    if (draggedProjectData.PROJCTSEQ === targetProject.PROJCTSEQ) {
        return;
    }

-    // 선택된 프로젝트 변경
+    pendingProjectChange.value = {
+        projctSeq: targetProject.PROJCTSEQ,
+        memberSeq: user.value.id
+    };
+
    checkedInProject.value = targetProject;
+    selectedProject.value = targetProject.PROJCTSEQ;
    projectStore.setSelectedProject(targetProject);

-    // select 값도 변경
-    selectedProject.value = targetProject.PROJCTSEQ;
-
-    $api.patch('commuters/update', {
-        projctSeq: targetProject.PROJCTSEQ,
-        memberSeq: user.value.id,
-    }).then(res => {
-        if (res.status === 200) {
-            todaysCommuter();
-            loadCommuters();
-        }
-    });
+    // 기존 UI 업데이트
+    commuters.value = commuters.value.map(commuter =>
+        commuter.MEMBERSEQ === user.value.id
+            ? { ...commuter, PROJCTNAM: targetProject.PROJCTNAM, PROJCTLVE: targetProject.PROJCTSEQ }
+            : commuter
+    );
 };

 // 오늘 출근 모든 사용자 조회
--- a/src/components/commuters/CommuterProjectList.vue
+++ b/src/components/commuters/CommuterProjectList.vue
@ -13,8 +13,10 @@
            </p>
            <div class="row gx-2">
                <div
-                    v-for="commuter in commuters.filter(c => c.PROJCTNAM === post.PROJCTNAM)"
-                    :key="commuter.COMMUTCMT"
+                    v-for="commuter in commuters.filter(c =>
+                        (c.PROJCTLVE ? c.PROJCTLVE === post.PROJCTSEQ : c.PROJCTNAM === post.PROJCTNAM)
+                    )"
+                    :key="commuter.MEMBERSEQ"
                    class="col-4"
                >
                    <div class="ratio ratio-1x1">
@ -77,7 +79,14 @@ const sortedProjects = computed(() => {
 });
 // 현재 사용자 확인
 const isCurrentUser = (commuter) => {
-    return props.user && commuter && commuter.MEMBERSEQ === props.user.id;
+    // 현재 사용자인지 확인
+    const isCurrentUserCheck = props.user && commuter && commuter.MEMBERSEQ === props.user.id;
+
+    // 퇴근 기록이 없는지 확인
+    const hasNoCheckRecord = !commuter.COMMUTLVE;
+
+    // 현재 사용자이면서 퇴근 기록이 없는 경우에만 true 반환
+    return isCurrentUserCheck && hasNoCheckRecord;
 };

 // 드래그 시작 이벤트 핸들러
--- a/src/components/list/ProjectCard.vue
+++ b/src/components/list/ProjectCard.vue
@ -63,7 +63,7 @@
                            </div>
                        </div>
                    </div>
-                    <button type="button" class="btn ms-auto text-white" :style="`background-color: ${projctColor} !important;`" @click.stop="openModal">log</button>
+                    <button type="button" class="btn ms-auto text-white" :style="`background-color: ${projctColor} !important;`" @click.stop="openModal"><i class='bx bx-child'></i></button>
                </div>
            </div>
        </div>
@ -71,7 +71,7 @@

    <!-- 로그 모달 -->
    <CenterModal :display="isModalOpen" @close="closeModal">
-        <template #title> Log </template>
+        <template #title> 등록·수정자 </template>
        <template #body>
            <div v-if="logData.length > 0">
                <div
--- a/src/components/modal/VacationGrantModal.vue
+++ b/src/components/modal/VacationGrantModal.vue
@ -6,7 +6,7 @@
                <button class="close-btn" @click="closeModal">✖</button>
            </div>
            <div class="vac-modal-body">
-                <p class="vac-modal-text">선물할 연차 개수를 선택하세요.</p>
+                <p class="vac-modal-text">선물할 연차 개수를 선택해 주세요.</p>
                <div class="count-container">
                    <button @click="decreaseCount" :disabled="grantCount < 2" class="count-btn">-</button>
                    <span class="count-value">{{ grantCount }}</span>
--- a/src/components/search/SearchBar.vue
+++ b/src/components/search/SearchBar.vue
@ -1,17 +1,21 @@
 <template>
-    <div class="input-group mb-3 d-flex">
-        <input
-            type="text"
-            class="form-control"
-            placeholder="Search"
-            v-model="searchQuery"
-            @keyup.enter="search"
-            @input="preventLeadingSpace"
-        />
-        <button type="button" class="btn btn-primary" @click="search">
-            <i class="bx bx-search bx-md"></i>
-        </button>
-    </div>
+    <form @submit.prevent="search">
+        <div class="input-group mb-3 d-flex">
+            <input
+                type="text"
+                class="form-control"
+                placeholder="Search"
+                v-model="searchQuery"
+                @input="preventLeadingSpace"
+            />
+            <button
+                type="submit"
+                class="btn btn-primary"
+            >
+                <i class="bx bx-search bx-md"></i>
+            </button>
+        </div>
+    </form>
 </template>

 <script setup>
@ -28,15 +32,31 @@ const props = defineProps({
 const emits = defineEmits(["update:data"]);
 const searchQuery = ref("");

-const search = function () {
-    // Type Number 일때 maxlength 적용 안됨 방지
-    if (searchQuery.value.length > props.maxlength) {
-        searchQuery.value = searchQuery.value.slice(0, props.maxlength);
+// 검색 실행 함수 (버튼 클릭 or 엔터 공통)
+const search = () => {
+    const trimmedQuery = searchQuery.value.trimStart();
+    if (trimmedQuery === "") {
+        emits("update:data", "");
+        return;
    }
+    if (trimmedQuery.length < 2 ) {
+        alert("검색어는 최소 2글자 이상 입력해주세요.");
+        searchQuery.value = '';
+        return;
+    }
+
+    // 길이 제한 처리
+    if (trimmedQuery.length > props.maxlength) {
+        searchQuery.value = trimmedQuery.slice(0, props.maxlength);
+    } else {
+        searchQuery.value = trimmedQuery;
+    }
+
    emits("update:data", searchQuery.value);
 };

-const preventLeadingSpace = function () {
+// 좌측 공백 제거
+const preventLeadingSpace = () => {
    searchQuery.value = searchQuery.value.trimStart();
 };
 </script>
--- a/src/components/voteboard/voteCardCheck.vue
+++ b/src/components/voteboard/voteCardCheck.vue
@ -29,6 +29,7 @@
                                    v-model="item.url"
                                    :is-essential="false"
                                    class="mb-1"
+                                    :maxlength="maxLength"
                        />
                    </div>
                    <div class="d-flex justify-content align-items-center mt-3">
@ -62,6 +63,7 @@ const contentAlerts = ref([false, false]);
 const titleAlert = ref(false);
 const title = ref('');
 const rink = ref('');
+const maxLength = ref(2000);
 const { itemList, addItem, removeItem } = voteCommon(true);
 const total = computed(() => props.total + itemList.value.length);
 const isSaveDisabled = computed(() => {
--- a/src/components/voteboard/voteCardCheckList.vue
+++ b/src/components/voteboard/voteCardCheckList.vue
@ -1,6 +1,6 @@
 <template>
    <div class="list-group">
-        <label class="list-group-item">
+        <label class="list-group-item" style="cursor: pointer;">
            <input
                class="form-check-input me-1"
                :name="data.LOCVOTSEQ"
@ -10,7 +10,12 @@
                @change="handleChange"
            >
            {{ data.LOCVOTCON }}
-            <a v-if="data.LOCVOTLIK" :href="data.LOCVOTLIK.startsWith('http') ? data.LOCVOTLIK : 'http://' + data.LOCVOTLIK" class="d-block text-truncate" target="_blank" rel="noopener noreferrer">
+            <a  :style="{ maxWidth: (data.LOCVOTLIK.length * 1) + 'ch' }"
+                v-if="data.LOCVOTLIK"
+                :href="data.LOCVOTLIK.startsWith('http') ? data.LOCVOTLIK : 'http://' + data.LOCVOTLIK"
+                class="text-truncate"
+                target="_blank"
+                rel="noopener noreferrer">
                {{ data.LOCVOTLIK }}
            </a>
        </label>
@ -51,11 +56,15 @@ const handleChange = (event) => {
    }
    emit("update:selectedValues", updatedValues);
 };
+const preventLinkMove = (event) =>{
+    event.preventDefault();
+}
 </script>

 <style>
 a {
-    max-width: 500px; /* 원하는 너비로 조정 */
+    display: block; /* 링크 텍스트에만 영역 적용 */
+    max-width: 500px;
    white-space: nowrap;
    overflow: hidden;
    text-overflow: ellipsis;
--- a/src/layouts/TheTop.vue
+++ b/src/layouts/TheTop.vue
@ -318,15 +318,10 @@
        // 사용자가 참여하고 있는 프로젝트 목록
        await projectStore.getMemberProjects();

-
-        // 저장된 선택 프로젝트
-        const storedProject = projectStore.getSelectedProject();
-        if (storedProject) {
-            selectedProject.value = storedProject.PROJCTSEQ;
-        } else if (projectStore.activeMemberProjectList.length > 0) {
-            // 저장된 선택 프로젝트가 없으면 첫 번째 참여 프로젝트 선택
-            selectedProject.value = projectStore.activeMemberProjectList[0].PROJCTSEQ;
-            projectStore.setSelectedProject(projectStore.activeMemberProjectList[0]);
+        if (myActiveProjects.value.length > 0) {
+            const firstProject = myActiveProjects.value[0];
+            selectedProject.value = firstProject.PROJCTSEQ;
+            projectStore.setSelectedProject(firstProject);
        }

    });
--- a/src/views/board/BoardList.vue
+++ b/src/views/board/BoardList.vue
@ -25,7 +25,7 @@
                    <!-- 공지 접기 기능 -->
                    <div class="form-check mb-0">
                        <input
-                            class="form-check-input"
+                            class="form-check-input mt-1"
                            type="checkbox"
                            v-model="showNotices"
                            id="hideNotices"
--- a/src/views/board/BoardView.vue
+++ b/src/views/board/BoardView.vue
@ -92,7 +92,7 @@
                                @updateReaction="handleUpdateReaction"
                            />
                        </div>
-
+                        <div v-if="unknown">
                        <!-- 댓글 입력 영역 -->
                        <BoardCommentArea
                            :profileName="profileName"
@ -102,6 +102,7 @@
                            :maxLength="500"
                            @submitComment="handleCommentSubmit"
                        />
+                        </div>
                    </div>

                    <!-- 댓글 목록 -->
--- a/src/views/voteboard/voteboardWrite.vue
+++ b/src/views/voteboard/voteboardWrite.vue
@ -57,6 +57,7 @@
                                    v-model="item.url"
                                    :is-essential="false"
                                    class="mb-1"
+                                    :maxlength="maxLength"
                                />
                                <!-- <link-input v-model="item.url"  class="mb-1"/> -->
                            </div>
@ -129,7 +130,7 @@ const { itemList, addItem, removeItem } = voteCommon();
 const userListTotal = ref(0);
 const addvoteitem = ref(false);
 const addvotemulti= ref(false);
-
+const maxLength = ref(2000);
 const dateInput = ref(null);

 const focusDateInput = () => {
--- a/src/views/wordDict/wordDict.vue
+++ b/src/views/wordDict/wordDict.vue
@ -29,9 +29,8 @@
                    <!-- 에러 메시지 -->
                    <div v-if="error" class="fw-bold text-danger">{{ error }}</div>
                    <!-- 단어 목록 -->
-                    <ul v-if="total > 0" class="ms-3 list-unstyled">
+                    <ul v-if="total > 0" class="ms-3 list-unstyled" style="overflow-x: hidden; word-wrap: break-word;">
                        <DictCard
-                            class="DictCard"
                            v-for="item in wordList"
                            :key="item.WRDDICSEQ"
                            :item="item"
@ -41,7 +40,8 @@
                        />
                    </ul>
                    <!-- 데이터가 없을 때 -->
-                    <div v-if="total == 0" class="text-center mt-5">용어를 선택 / 작성해 주세요</div>
+
+                    <div v-if="total == 0" class="text-center mt-5">{{ searchText ? '검색된 목록이 없습니다.':'용어를 선택 / 작성해 주세요' }}</div>
                </div>
            </div>
        </div>
@ -151,8 +151,20 @@
    // 검색
    const search = (e) => {
        searchText.value = e.trim();
-        getwordList(searchText.value, selectedAlphabet.value, selectedCategory.value);
-    };
+        if(searchText.value){
+            getwordList(searchText.value, selectedAlphabet.value, selectedCategory.value);
+        }else{
+            if( selectedCategory.value !== '' && selectedCategory.value !== null){
+                getwordList(searchText.value, selectedAlphabet.value, selectedCategory.value);
+            }
+            else if( selectedAlphabet.value !== '' && selectedAlphabet.value !== null){
+                getwordList(searchText.value, selectedAlphabet.value, selectedCategory.value);
+            }else{
+                wordList.value = [];
+                total.value = 0;
+            }
+        };
+    }

    // 알파벳 선택
    const handleSelectedAlphabetChange = (newAlphabet) => {
@ -280,9 +292,4 @@
    height: fit-content;
 }

-.DictCard {
-    display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
-    gap: 1rem;
-}
 </style>