Merge branch 'main' into board-ji

src/components/board/BoardComment.vue

@@ -24,6 +24,7 @@
                     class="form-control"
                     :value="password"
                     autocomplete="new-password"
+                    maxlength="4"
                     placeholder="비밀번호 입력"
                     @input="filterInput"
                 />
@@ -42,7 +43,7 @@
             </template>
 
             <template v-else>
-                <p class="m-0">{{ comment.content }}</p>
+                <div class="m-0" style="white-space: pre-wrap">{{ comment.content }}</div>
             </template>
         </div>
         <!-- <p>현재 isDeleted 값: {{ isDeleted }}</p> -->
@@ -119,7 +120,7 @@
     });
 
     const displayName = computed(() => {
-    return props.nickname? props.nickname: props.comment.author;
+        return props.nickname ? props.nickname : props.comment.author;
     });
 
     // emits 정의

src/components/board/BoardCommentArea.vue

@@ -43,7 +43,7 @@
                             @input="clearAlert('nickname')"
                         />
                         <!-- 닉네임 경고 메시지 -->
-                        <div v-if="nicknameAlert" class="position-absolute text-danger small top-100 start-0" >
+                        <div v-if="nicknameAlert" class="position-absolute text-danger small top-100 start-0">
                             {{ nicknameAlert }}
                         </div>
                     </div>
@@ -57,7 +57,11 @@
                             autocomplete="new-password"
                             v-model="password"
                             placeholder="비밀번호"
-                            @input="clearAlert('password')"
+                            maxlength="4"
+                            @input="
+                                password = password.replace(/\s/g, '');
+                                clearAlert('password');
+                            "
                         />
                         <!-- 비밀번호 경고 메시지 -->
                         <div v-if="passwordAlert2" class="position-absolute text-danger small top-100 start-0">
@@ -145,6 +149,7 @@
 
             if (!$common.isNotEmpty(password.value)) {
                 passwordAlert2.value = '비밀번호를 입력해주세요.';
+                password.value = '';
                 isValid = false;
             } else {
                 passwordAlert2.value = '';

src/views/board/BoardEdit.vue

@@ -166,7 +166,8 @@
     // 목록 페이지로 이동
     const goList = () => {
         accessStore.$reset();
-        router.push('/board');
+        //router.push('/board');
+        router.back();
     };
 
     // 전 페이지로 이동

src/views/board/BoardView.vue

@@ -562,6 +562,7 @@
             if (comment.isEditTextarea) {
                 comment.isEditTextarea = false;
                 comment.isCommentPassword = true;
+                toggleCommentPassword(comment, 'delete');
             } else {
                 toggleCommentPassword(comment, 'delete');
             }

src/views/wordDict/wordDict.vue

@@ -31,6 +31,7 @@
                     <!-- 단어 목록 -->
                     <ul v-if="total > 0" class="ms-3 list-unstyled">
                         <DictCard
+                            class="DictCard"
                             v-for="item in wordList"
                             :key="item.WRDDICSEQ"
                             :item="item"