From 67d5bede3235ec1c48cbd86727cf7f92123ed45a Mon Sep 17 00:00:00 2001
From: khj0414 <khj0414@local-host.co.kr>
Date: Thu, 6 Feb 2025 10:29:08 +0900
Subject: [PATCH 1/3] =?UTF-8?q?=EC=9A=A9=EC=97=AC=EC=A7=91=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/wordDict/DictWrite.vue | 62 ++++++++++++++++++++++-----
 src/views/wordDict/wordDict.vue       | 23 +++++++---
 2 files changed, 69 insertions(+), 16 deletions(-)

diff --git a/src/components/wordDict/DictWrite.vue b/src/components/wordDict/DictWrite.vue
index 9d040f1..8cd2a6d 100644
--- a/src/components/wordDict/DictWrite.vue
+++ b/src/components/wordDict/DictWrite.vue
@@ -1,18 +1,28 @@
 <template>
     <div class="d-flex">
-        <FormSelect :isLabel="false" :data="formattedDataList" :isCommon="true" name="용어집 카테고리" title="용어집 카테고리"/>
-        <button @click="toggleInput">+</button>
+        <FormSelect name="cate"
+                    title="카테고리"
+                    :data="formattedDataList"
+                    :is-common="true"
+                    @update:data="selectCategory = $event"
+        />        <button @click="toggleInput">+</button>
         <div class="d-flex" v-if="showInput">
-            <FormInput :isLabel="false" title="용어집 입력" name="용어집 입력"/>
+            <FormInput :isLabel="false" title="카테고리" name="카테고리"  @update:modelValue="addCategory = $event" :is-alert="addCategoryAlert"/>
             <button @click="saveInput">저장</button>
         </div>
     </div>
     <div>
-        <FormInput title="내용" name="용어집 내용 입력"/>
-    </div>
+        <FormInput
+                title="용어"
+                type="text"
+                name="word"
+                :is-essential="true"
+                :is-alert="wordTitleAlert"
+                @update:modelValue="wordTitle = $event"
+            />    </div>
     <div>
-        <QEditor/>
-        <button>저장</button>
+        <QEditor @update:data="content = $event" @update:imageUrls="imageUrls = $event"  :is-alert="true" />
+        <button @click="saveWord">저장</button>
         <button @click="$emit('close')">취소</button>
     </div>
 </template>
@@ -24,7 +34,20 @@ import QEditor from '@/components/editor/QEditor.vue';
 import FormInput from '@/components/input/FormInput.vue';
 import FormSelect from '@/components/input/FormSelect.vue';
 
-const emit = defineEmits(['close']);
+const emit = defineEmits(['close','addCategory','addWord']);
+
+//용어제목
+const wordTitle =ref('');
+const addCategory =ref('');
+const content = ref('');
+const imageUrls = ref([]);
+
+//용어 Vaildation용
+const wordTitleAlert = ref(false);
+const addcateAlert =ref(false);
+const addCategoryAlert = ref(false);
+//선택 카테고리
+const selectCategory = ref('');
 
 const props = defineProps({
     dataList: {
@@ -46,12 +69,29 @@ const showInput = ref(false);
 
 // 카테고리 입력 토글
 const toggleInput = () => {
-    howInput.value = !showInput.value;
+    showInput.value = !showInput.value;
 };
 
 // 카테고리 저장
 const saveInput = () => {
-    console.log('입력값 저장됨!');
+    if( addCategory.value == ''){
+        addCategoryAlert.value = true;
+        return;
+    }
+    console.log('입력값 저장됨!',addCategory.value);
+    emit('addCategory', addCategory.value);
     showInput.value = false;
 };
-</script>
\ No newline at end of file
+
+//용어 등록
+const saveWord = () => {
+    //validation 체크후 emit전송 수정해야함
+
+    const wordData = {
+        title: wordTitle.value,
+        category: selectCategory.value,
+        content: content.value,
+    };
+    emit('addWord', wordData);
+};
+</script>
diff --git a/src/views/wordDict/wordDict.vue b/src/views/wordDict/wordDict.vue
index 7efb616..390a4c0 100644
--- a/src/views/wordDict/wordDict.vue
+++ b/src/views/wordDict/wordDict.vue
@@ -30,7 +30,7 @@
 
             <!-- 작성 -->
             <div v-if="isWriteVisible" class="mt-5">
-                <DictWrite @close="isWriteVisible = false" :dataList="cateList"/>
+                <DictWrite @close="isWriteVisible = false" :dataList="cateList" @addCategory="addCategory"/>
             </div>
         </div>
 
@@ -69,7 +69,9 @@
     import DictCard from '@/components/wordDict/DictCard.vue';
     import DictWrite from '@/components/wordDict/DictWrite.vue';
     import DictAlphabetFilter from '@/components/wordDict/DictAlphabetFilter.vue';
+    import { useToastStore } from '@s/toastStore';
 
+    const toastStore = useToastStore();
 
     // 공통
     const loading = ref(false);
@@ -87,7 +89,7 @@
 
     //선택된 알파벳
     const selectedAlphabet = ref('');
-    
+
     // 검색
     const searchText = ref('');
 
@@ -99,12 +101,12 @@
         getwordList();
         getwordCategory();
     });
-    
+
     //용어 목록
     const getwordList = (searchKeyword='', indexKeyword='', category='') => {
         axios.get('worddict/getWordList',{
             //목록조회시 파라미터 전달
-            params: { 
+            params: {
                         searchKeyword : searchKeyword,
                         indexKeyword :indexKeyword,
                         category : category
@@ -157,6 +159,17 @@
         isWriteVisible.value = !isWriteVisible.value;
     };
 
+    //카테고리 등록
+    const addCategory = (data) =>{
+        axios.post('worddict/insertCategory',{
+            CMNCODNAM: data
+        }).then(res=>{
+            if(res.data.data == '1'){
+                toastStore.onToast('카테고리가 등록되었습니다.', 's');
+            }
+        })
+    }
+    //용어 등록
 
 </script>
 
@@ -172,4 +185,4 @@
         margin-bottom: 0.5rem !important;
     }
 }
-</style>
\ No newline at end of file
+</style>

From 69afdab9469f0c71bb6360d2bc78a6b4d2a1dd82 Mon Sep 17 00:00:00 2001
From: khj0414 <khj0414@local-host.co.kr>
Date: Thu, 6 Feb 2025 13:26:07 +0900
Subject: [PATCH 2/3] =?UTF-8?q?=EC=9A=A9=EC=96=B4=EC=A7=91=20=EC=B9=B4?=
 =?UTF-8?q?=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/wordDict/DictWrite.vue | 20 +++++++++++++-------
 src/views/wordDict/wordDict.vue       |  8 +++++++-
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/components/wordDict/DictWrite.vue b/src/components/wordDict/DictWrite.vue
index 8cd2a6d..3fd2826 100644
--- a/src/components/wordDict/DictWrite.vue
+++ b/src/components/wordDict/DictWrite.vue
@@ -1,11 +1,14 @@
 <template>
     <div class="d-flex">
-        <FormSelect name="cate"
-                    title="카테고리"
-                    :data="formattedDataList"
-                    :is-common="true"
-                    @update:data="selectCategory = $event"
-        />        <button @click="toggleInput">+</button>
+        <FormSelect
+            name="cate"
+            title="카테고리"
+            :data="formattedDataList"
+            :is-common="true"
+            @update:data="selectCategory = $event"
+            @change="onChange"
+            />
+        <button @click="toggleInput">+</button>
         <div class="d-flex" v-if="showInput">
             <FormInput :isLabel="false" title="카테고리" name="카테고리"  @update:modelValue="addCategory = $event" :is-alert="addCategoryAlert"/>
             <button @click="saveInput">저장</button>
@@ -83,10 +86,13 @@ const saveInput = () => {
     showInput.value = false;
 };
 
+const onChange = (newValue) => {
+    selectCategory.value =newValue.target.value;
+};
+
 //용어 등록
 const saveWord = () => {
     //validation 체크후 emit전송 수정해야함
-
     const wordData = {
         title: wordTitle.value,
         category: selectCategory.value,
diff --git a/src/views/wordDict/wordDict.vue b/src/views/wordDict/wordDict.vue
index 390a4c0..a6c209b 100644
--- a/src/views/wordDict/wordDict.vue
+++ b/src/views/wordDict/wordDict.vue
@@ -161,11 +161,17 @@
 
     //카테고리 등록
     const addCategory = (data) =>{
+        const lastCategory = cateList.value[cateList.value.length - 1];
+        const newValue = lastCategory ? parseInt(lastCategory.CMNCODVAL) + 1 : 600101;
+
         axios.post('worddict/insertCategory',{
             CMNCODNAM: data
         }).then(res=>{
             if(res.data.data == '1'){
-                toastStore.onToast('카테고리가 등록되었습니다.', 's');
+                toastStore.onToast('카테고리가 추가 등록 되었습니다.', 's');
+                const newCategory = { CMNCODNAM: data, CMNCODVAL: newValue.toString()   };  // Assuming CMNCODVAL is the same as CMNCODNAM
+                cateList.value.unshift(newCategory);
+                selectCategory.value = newCategory.CMNCODVAL;
             }
         })
     }

From e61bcd20ce1956dd89b3d8f68c7e9ca896423f3a Mon Sep 17 00:00:00 2001
From: Dang <wheodnjs2@naver.com>
Date: Thu, 6 Feb 2025 16:16:25 +0900
Subject: [PATCH 3/3] =?UTF-8?q?=EC=9A=A9=EC=96=B4=EC=A7=91=20=EB=93=B1?=
 =?UTF-8?q?=EB=A1=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/category/CategoryBtn.vue | 11 ++++++
 src/components/wordDict/DictWrite.vue   | 49 ++++++++++++++++++-------
 src/views/wordDict/wordDict.vue         | 31 ++++++++++++++--
 3 files changed, 74 insertions(+), 17 deletions(-)

diff --git a/src/components/category/CategoryBtn.vue b/src/components/category/CategoryBtn.vue
index c98ea10..ee8a618 100644
--- a/src/components/category/CategoryBtn.vue
+++ b/src/components/category/CategoryBtn.vue
@@ -43,4 +43,15 @@ const selectCategory = (cate) => {
 .cate-list {
     margin-left: -0.25rem;
 }
+
+@media (max-width: 768px) {
+    .cate-list {
+        overflow-x: scroll;
+        flex-wrap: nowrap !important;
+        
+        li {
+            flex: 0 0 auto;
+        }
+    }
+}
 </style>
\ No newline at end of file
diff --git a/src/components/wordDict/DictWrite.vue b/src/components/wordDict/DictWrite.vue
index 3fd2826..eccf5a3 100644
--- a/src/components/wordDict/DictWrite.vue
+++ b/src/components/wordDict/DictWrite.vue
@@ -7,11 +7,15 @@
             :is-common="true"
             @update:data="selectCategory = $event"
             @change="onChange"
-            />
-        <button @click="toggleInput">+</button>
+        />
+
+        <PlusBtn @click="toggleInput"/>
+        
         <div class="d-flex" v-if="showInput">
             <FormInput :isLabel="false" title="카테고리" name="카테고리"  @update:modelValue="addCategory = $event" :is-alert="addCategoryAlert"/>
-            <button @click="saveInput">저장</button>
+            <button class="btn btn-primary" @click="saveInput">
+                <i class="bx bx-check"></i>
+            </button>
         </div>
     </div>
     <div>
@@ -22,10 +26,13 @@
                 :is-essential="true"
                 :is-alert="wordTitleAlert"
                 @update:modelValue="wordTitle = $event"
-            />    </div>
+            />
+    </div>
     <div>
-        <QEditor @update:data="content = $event" @update:imageUrls="imageUrls = $event"  :is-alert="true" />
-        <button @click="saveWord">저장</button>
+        <QEditor @update:data="content = $event" @update:imageUrls="imageUrls = $event"  :is-alert="wordContentAlert" />
+        <button class="btn btn-primary" @click="saveWord">
+            <i class="bx bx-check"></i>
+        </button>
         <button @click="$emit('close')">취소</button>
     </div>
 </template>
@@ -36,19 +43,21 @@ import { defineProps, computed, ref, defineEmits } from 'vue';
 import QEditor from '@/components/editor/QEditor.vue';
 import FormInput from '@/components/input/FormInput.vue';
 import FormSelect from '@/components/input/FormSelect.vue';
+import PlusBtn from '../button/PlusBtn.vue';
 
 const emit = defineEmits(['close','addCategory','addWord']);
 
 //용어제목
-const wordTitle =ref('');
-const addCategory =ref('');
+const wordTitle = ref('');
+const addCategory = ref('');
 const content = ref('');
 const imageUrls = ref([]);
 
 //용어 Vaildation용
 const wordTitleAlert = ref(false);
-const addcateAlert =ref(false);
+const wordContentAlert = ref(false);
 const addCategoryAlert = ref(false);
+
 //선택 카테고리
 const selectCategory = ref('');
 
@@ -77,27 +86,41 @@ const toggleInput = () => {
 
 // 카테고리 저장
 const saveInput = () => {
-    if( addCategory.value == ''){
+    if(addCategory.value == ''){
         addCategoryAlert.value = true;
         return;
     }
-    console.log('입력값 저장됨!',addCategory.value);
+    // console.log('입력값 저장됨!',addCategory.value);
     emit('addCategory', addCategory.value);
     showInput.value = false;
 };
 
 const onChange = (newValue) => {
-    selectCategory.value =newValue.target.value;
+    selectCategory.value = newValue.target.value;
 };
 
 //용어 등록
 const saveWord = () => {
-    //validation 체크후 emit전송 수정해야함
+    //validation
+
+    // 용어 체크
+    if(wordTitle.value == ''){
+        wordTitleAlert.value = true;
+        return;
+    }
+
+    // 내용 체크
+    if(content.value == ''){
+        wordContentAlert.value = true;
+        return;
+    }
+
     const wordData = {
         title: wordTitle.value,
         category: selectCategory.value,
         content: content.value,
     };
+
     emit('addWord', wordData);
 };
 </script>
diff --git a/src/views/wordDict/wordDict.vue b/src/views/wordDict/wordDict.vue
index a6c209b..36a8641 100644
--- a/src/views/wordDict/wordDict.vue
+++ b/src/views/wordDict/wordDict.vue
@@ -30,7 +30,7 @@
 
             <!-- 작성 -->
             <div v-if="isWriteVisible" class="mt-5">
-                <DictWrite @close="isWriteVisible = false" :dataList="cateList" @addCategory="addCategory"/>
+                <DictWrite @close="isWriteVisible = false" :dataList="cateList" @addCategory="addCategory" @addWord="addWord"/>
             </div>
         </div>
 
@@ -61,7 +61,7 @@
 </template>
 
 <script setup>
-    import { ref, watchEffect, computed, onMounted } from 'vue';
+    import { ref, watchEffect, computed, onMounted, getCurrentInstance } from 'vue';
     import axios from '@api';
     import SearchBar from '@c/search/SearchBar.vue';
     import WriteButton from '@c/button/WriteBtn.vue';
@@ -71,6 +71,9 @@
     import DictAlphabetFilter from '@/components/wordDict/DictAlphabetFilter.vue';
     import { useToastStore } from '@s/toastStore';
 
+    const { appContext } = getCurrentInstance();
+    const $common = appContext.config.globalProperties.$common;
+
     const toastStore = useToastStore();
 
     // 공통
@@ -166,16 +169,36 @@
 
         axios.post('worddict/insertCategory',{
             CMNCODNAM: data
-        }).then(res=>{
+        }).then(res => {
             if(res.data.data == '1'){
                 toastStore.onToast('카테고리가 추가 등록 되었습니다.', 's');
-                const newCategory = { CMNCODNAM: data, CMNCODVAL: newValue.toString()   };  // Assuming CMNCODVAL is the same as CMNCODNAM
+                const newCategory = { CMNCODNAM: data, CMNCODVAL: newValue.toString() };  // Assuming CMNCODVAL is the same as CMNCODNAM
                 cateList.value.unshift(newCategory);
                 selectCategory.value = newCategory.CMNCODVAL;
             }
         })
     }
     //용어 등록
+    const addWord = (wordData) => {
+
+        // console.log('단어 추가됨:', wordData.category); // WRDDICCAT
+        // console.log('단어 추가됨:', wordData.content); // WRDDICCON
+        // console.log('단어 추가됨:', wordData.title); // WRDDICTTL
+
+        axios.post('worddict/insertWord',{
+            WRDDICCAT : wordData.category,
+            WRDDICTTL : wordData.title,
+            WRDDICCON : $common.deltaAsJson(wordData.content),
+        }).then(res => {
+            if(res.data.data == '1'){
+                toastStore.onToast('용어가 등록 되었습니다.', 's');
+                isWriteVisible.value = false
+                // const newCategory = { CMNCODNAM: data, CMNCODVAL: newValue.toString() };
+                // cateList.value.unshift(newCategory);
+                // selectCategory.value = newCategory.CMNCODVAL;
+            }
+        })
+    };
 
 </script>