localnet/localhost-front
10
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'khj'

Browse Source
This commit is contained in:
khj0414 2025-03-20 10:53:38 +09:00
commit 733510213a
3 changed files with 42 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/components/wordDict/DictCard.vue
View File

@ -19,41 +19,43 @@
</div> </div>
</div> </div>
<p class="mt-5 dict-content-wrap" v-html="$common.contentToHtml(item.WRDDICCON)"></p> <p class="mt-5 dict-content-wrap" v-html="$common.contentToHtml(item.WRDDICCON)"></p>
<div class="d-flex justify-content-between flex-wrap gap-2 mb-2"> <div class="d-flex align-items-start">
<div class="d-flex flex-wrap align-items-center mb-50"> <!-- 최초 작성자 -->
<div class="d-flex flex-wrap align-items-center me-4">
<div class="avatar avatar-sm me-2"> <div class="avatar avatar-sm me-2">
<img <img
class="rounded-circle user-avatar" class="rounded-circle user-avatar"
:src="getProfileImage(item.author.profileImage)" :src="getProfileImage(item.author.profileImage)"
alt="최초 작성자" alt="최초 작성자"
:style="{ borderColor: item.author.color}" :style="{ borderColor: item.author.color }"
@error="setDefaultImage" @error="setDefaultImage"
/> />
</div> </div>
<div> <div>
<p class="mb-0 small fw-medium">{{ $common.dateFormatter(item.author.createdAt) }}</p> <p class="mb-0 small fw-medium">{{ $common.dateFormatter(item.author.createdAt) }}</p>
</div> </div>
</div> </div>
</div>
<div <!-- 최근 작성자 (조건부) -->
v-if="item.author.createdAt !== item.lastEditor.updatedAt" <div
class="d-flex justify-content-between flex-wrap gap-2 mb-2" v-if="item.author.createdAt !== item.lastEditor.updatedAt"
> class="d-flex flex-wrap align-items-center"
<div class="d-flex flex-wrap align-items-center mb-50"> >
<div class="avatar avatar-sm me-2"> <div class="avatar avatar-sm me-2">
<img <img
class="rounded-circle user-avatar" class="rounded-circle user-avatar"
:src="getProfileImage(item.lastEditor.profileImage)" :src="getProfileImage(item.lastEditor.profileImage)"
alt="최근 작성자" alt="최근 작성자"
:style="{ borderColor: item.lastEditor.color}" :style="{ borderColor: item.lastEditor.color }"
@error="setDefaultImage" @error="setDefaultImage"
/> />
</div> </div>
<div> <div>
<p class="mb-0 small fw-medium">{{ $common.dateFormatter(item.lastEditor.updatedAt) }}</p> <p class="mb-0 small fw-medium">{{ $common.dateFormatter(item.lastEditor.updatedAt) }}</p>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="edit-btn"> <div class="edit-btn">

6
src/components/wordDict/DictWrite.vue
View File

@ -17,7 +17,7 @@
</div> </div>
<div v-if="dataList.length === 0 || showInput"> <div v-if="dataList.length === 0 || showInput">
<FormInput <FormInput
class="me-5" class="me-5 parent-class "
ref="categoryInputRef" ref="categoryInputRef"
title="새 카테고리" title="새 카테고리"
:isLabel="dataList.length === 0 ?true : false" :isLabel="dataList.length === 0 ?true : false"
@ -25,6 +25,7 @@
@update:modelValue="addCategory = $event" @update:modelValue="addCategory = $event"
:is-cate-alert="addCategoryAlert" :is-cate-alert="addCategoryAlert"
@focusout="handleCategoryFocusout(addCategory)" @focusout="handleCategoryFocusout(addCategory)"
/> />
</div> </div>
<FormInput class="me-5" <FormInput class="me-5"
@ -219,4 +220,7 @@ const handleCategoryFocusout = (value) => {
right: 0.7rem; right: 0.7rem;
top: 1.2rem; top: 1.2rem;
} }
.parent-class {
justify-content: flex-end;
}
</style> </style>

6
src/views/wordDict/wordDict.vue
View File

@ -31,6 +31,7 @@
<!-- 단어 목록 --> <!-- 단어 목록 -->
<ul v-if="total > 0" class="ms-3 list-unstyled"> <ul v-if="total > 0" class="ms-3 list-unstyled">
<DictCard <DictCard
class="DictCard"
v-for="item in wordList" v-for="item in wordList"
:key="item.WRDDICSEQ" :key="item.WRDDICSEQ"
:item="item" :item="item"
@ -282,4 +283,9 @@
margin-bottom: 0.5rem !important; margin-bottom: 0.5rem !important;
} }
} }
.DictCard {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
gap: 1rem;
}
</style> </style>