Merge branch 'khj'

src/components/category/CategoryBtn.vue

@@ -5,35 +5,33 @@
             type="button"
             class="btn"
             :class="{
-                'btn-outline-primary': selectedCategory !== 'all',
+            'btn-outline-primary': selectedCategory !== 'all',
-                'btn-primary': selectedCategory === 'all'
+            'btn-primary': selectedCategory === 'all'
             }"
             @click="selectCategory('all')"
         >
-        All
+            All
         </button>
         </li>
         <li v-for="category in lists" :key="category.value" class="mt-2 me-2">
-            <button
+        <button
-                type="button"
+            type="button"
-                class="btn"
+            class="btn"
-                :class="{
+            :class="{
-                    'btn-outline-primary': category.value !== selectedCategory,
+                'btn-outline-primary': category.value.toString() !== selectedCategory?.toString(),
-                    'btn-primary': category.value === selectedCategory
+                'btn-primary': category.value.toString() === selectedCategory?.toString()
                 }"
-                @click="selectCategory(category.value)"
+            @click="selectCategory(category.value)"
-            >
+        >
-                {{ category.label }}
+            {{ category.label }}
-            </button>
+        </button>
         </li>
     </ul>
-
 </template>
 
 <script setup>
-import { defineProps, ref, watch } from 'vue';
+import { defineProps, defineEmits, ref, watch } from 'vue';
 
-// lists prop 정의
 const props = defineProps({
     lists: {
         type: Array,
@@ -44,7 +42,7 @@ const props = defineProps({
         required: false,
     },
     selectedCategory: {
-        type: [String, Number],
+        type: String,
         default: null,
         required: false,
     },
@@ -63,4 +61,5 @@ watch(() => props.selectedCategory, (newVal) => {
     selectedCategory.value = newVal;
 });
 
+
 </script>

src/components/wordDict/DictCard.vue

@@ -9,16 +9,9 @@
             :formValue="item.WRDDICCAT"
             :titleValue="item.WRDDICTTL"
             :contentValue="item.WRDDICCON"
-            :isDisabled="userStore.user.role !== 'ROLE_ADMIN'"
+            :isDisabled="true"
             />
         <div v-else>
-            <input
-                v-if="userStore.user.role == 'ROLE_ADMIN'"
-                type="checkbox"
-                class="form-check-input admin-chk"
-                :name="item.WRDDICSEQ"
-                @change="toggleCheck($event)"
-            >
             <div class="d-flex align-ite-center">
                 <div class="w-100 d-flex align-items-center">
                     <span class="btn btn-primary pe-none">{{ item.category }}</span>
@@ -129,7 +122,7 @@ const editWord = (data) => {
             if (writeButton.value) {
                 writeButton.value.resetButton();
             }
-            emit('refreshWordList');
+            emit('refreshWordList',data.category);
         } else {
             console.warn('⚠️ 서버 응답이 예상과 다릅니다:', res.data);
             toastStore.onToast('용어 수정이 정상적으로 처리되지 않았습니다.', 'e');

src/components/wordDict/DictWrite.vue

@@ -1,6 +1,7 @@
 <template>
-    <div>
+    <div v-if="dataList.length > 0">
-        <FormSelect class="me-5"
+        <FormSelect
+            class="me-5"
             name="cate"
             title="카테고리"
             :data="dataList"
@@ -14,17 +15,18 @@
             <PlusBtn @click="toggleInput"/>
         </div>
     </div>
-
+    <div v-if="dataList.length === 0 || showInput">
-        <div v-if="showInput">
+        <FormInput
-            <FormInput class="me-5"
+            class="me-5"
-                ref="categoryInputRef"
+            ref="categoryInputRef"
-                title="새 카테고리"
+            title="새 카테고리"
-                name="새 카테고리"
+            :isLabel="dataList.length === 0 ?true : false"
-                @update:modelValue="addCategory = $event"
+            name="새 카테고리"
-                :is-cate-alert="addCategoryAlert"
+            @update:modelValue="addCategory = $event"
-                @focusout="handleCategoryFocusout(addCategory)"
+            :is-cate-alert="addCategoryAlert"
-            />
+            @focusout="handleCategoryFocusout(addCategory)"
-        </div>
+        />
+    </div>
         <FormInput class="me-5"
             title="용어"
             type="text"

src/views/wordDict/wordDict.vue

@@ -112,7 +112,8 @@
         writeStore.closeAll();
     });
 
-    const refreshWordList = () => {
+    const refreshWordList = (category) => {
+        selectedCategory.value = category;
         getwordList(searchText.value, selectedAlphabet.value, selectedCategory.value);
     };
 
@@ -193,6 +194,7 @@
         sendWordRequest(category, wordData, newCodName);
     };
     const sendWordRequest = (category, wordData, data) => {
+        console.log(category,'category')
         const payload = {
             WRDDICCAT: category,
             WRDDICTTL: wordData.title,
@@ -206,9 +208,9 @@
                     if (writeButton.value) {
                         writeButton.value.resetButton();
                     }
-                    getwordList();
+                    selectedCategory.value = category;
+                    getwordList(searchText.value, selectedAlphabet.value, selectedCategory.value);
                     getIndex();
-                    selectedCategory.value = 'all';
                     if(res.data.data == '2'){
                         const newCategory = { label: data, value: category };
                         cateList.value = [...cateList.value,newCategory];