diff --git a/public/css/font.css b/public/css/font.css index 5858175..64d555c 100644 --- 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; } diff --git a/src/components/list/ProjectCard.vue b/src/components/list/ProjectCard.vue index 2796a88..a529850 100644 --- a/src/components/list/ProjectCard.vue +++ b/src/components/list/ProjectCard.vue @@ -63,7 +63,7 @@ - log + @@ -71,7 +71,7 @@ - Log + 등록·수정자 - + {{ error }} - + - 용어를 선택 / 작성해 주세요 + + {{ searchText ? '검색된 목록이 없습니다.':'용어를 선택 / 작성해 주세요' }} @@ -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; -}