Merge branch 'khj'

src/components/wordDict/DictCard.vue

@@ -16,8 +16,9 @@
         <div v-else>
             <div class="d-flex align-items-center justify-content-between">
                 <div class="d-flex align-items-center">
-                    <span class="btn btn-primary pe-none">{{ item.category }}</span>
+                    <span class="btn btn-primary pe-none m-1"
-                    <strong class="mx-2 w-75">{{ item.WRDDICTTL }}</strong>
+                    style="writing-mode: horizontal-tb;">{{ item.category }}</span>
+                     {{ item.WRDDICTTL }}
                 </div>
                 <EditBtn
                     @click="toggleEdit"
@@ -178,4 +179,7 @@ const toggleEdit = async () => {
     top: -0.5rem;
     --bs-form-check-bg: #fff;
 }
+.btn.btn-primary {
+    writing-mode: horizontal-tb;
+}
 </style>

src/components/wordDict/DictWrite.vue

@@ -51,7 +51,7 @@
         <div>
             <QEditor class="" @keyup="ValidHandler('content')"  @update:data="handleContentUpdate" @update:imageUrls="imageUrls = $event"  :is-alert="wordContentAlert" :initialData="contentValue"/>
             <div class="text-end mt-5">
-                <button class="btn btn-primary" @click="saveWord">
+                <button class="btn btn-primary" @click="saveWord" :disabled="!changed">
                     <i class="bx bx-check"></i>
                 </button>
             </div>
@@ -67,39 +67,6 @@ import FormSelect from '@/components/input/FormSelect.vue';
 import PlusBtn from '../button/PlusBtn.vue';
 import EditBtn from '../button/EditBtn.vue';
 import { useWriteVisibleStore } from '@s/writeVisible';
-
-const writeStore = useWriteVisibleStore();
-
-const emit = defineEmits(['close','addCategory','addWord', 'toggleEdit']);
-
-//용어제목
-const wordTitle = ref('');
-const addCategory = ref('');
-const content = ref('');
-const imageUrls = ref([]);
-
-//용어 Vaildation용
-const wordTitleAlert = ref(false);
-const wordContentAlert = ref(false);
-const addCategoryAlert = ref(false);
-
-//선택 카테고리
-const selectCategory = ref('');
-
-// 제목 상태
-const computedTitle = computed(() =>
-    wordTitle.value === '' ? props.titleValue : wordTitle.value
-);
-
-// 카테고리 상태
-const selectedCategory = computed(() =>
-    selectCategory.value === '' ? props.formValue : selectCategory.value
-
-);
-
-// 카테고리 입력 중복 ref
-const categoryInputRef = ref(null);
-
 const props = defineProps({
     dataList: {
         type: Array,
@@ -126,6 +93,38 @@ const props = defineProps({
     }
 });
 
+const writeStore = useWriteVisibleStore();
+
+const emit = defineEmits(['close','addCategory','addWord', 'toggleEdit']);
+
+//용어제목
+const wordTitle = ref('');
+const addCategory = ref('');
+const content = ref('');
+const imageUrls = ref([]);
+//용어 Vaildation용
+const wordTitleAlert = ref(false);
+const wordContentAlert = ref(false);
+const addCategoryAlert = ref(false);
+const  changed = ref(false);
+//선택 카테고리
+const selectCategory = ref('');
+
+// 제목 상태
+const computedTitle = computed(() =>
+    wordTitle.value === '' ? props.titleValue : wordTitle.value
+);
+
+// 카테고리 상태
+const selectedCategory = computed(() =>
+    selectCategory.value === '' ? props.formValue : selectCategory.value
+
+);
+
+// 카테고리 입력 중복 ref
+const categoryInputRef = ref(null);
+
+
 // 카테고리 입력 창
 const showInput = ref(false);
 
@@ -136,6 +135,7 @@ const toggleInput = () => {
 
 const onChange = (newValue) => {
     selectCategory.value = newValue.target.value;
+    changed.value = true;
 };
 
 const ValidHandler = (field) => {
@@ -144,6 +144,7 @@ const ValidHandler = (field) => {
     }
     if(field == 'content'){
         wordContentAlert.value = false;
+
     }
 
 }

src/views/wordDict/wordDict.vue

@@ -118,7 +118,9 @@ import { useRoute } from 'vue-router';
         const maincategory = route.query.category || '';
         selectedAlphabet.value = mainindexKeyword;
         selectedCategory.value = maincategory;
-        getwordList('', selectedAlphabet.value, selectedCategory.value );
+        if(mainindexKeyword){
+            getwordList('', selectedAlphabet.value, selectedCategory.value );
+        }
     });
 
     const refreshWordList = (category) => {