Merge branch 'khj'
This commit is contained in:
commit
733510213a
@ -19,14 +19,15 @@
|
||||
</div>
|
||||
</div>
|
||||
<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 flex-wrap align-items-center mb-50">
|
||||
<div class="d-flex align-items-start">
|
||||
<!-- 최초 작성자 -->
|
||||
<div class="d-flex flex-wrap align-items-center me-4">
|
||||
<div class="avatar avatar-sm me-2">
|
||||
<img
|
||||
class="rounded-circle user-avatar"
|
||||
:src="getProfileImage(item.author.profileImage)"
|
||||
alt="최초 작성자"
|
||||
:style="{ borderColor: item.author.color}"
|
||||
:style="{ borderColor: item.author.color }"
|
||||
@error="setDefaultImage"
|
||||
/>
|
||||
</div>
|
||||
@ -34,18 +35,18 @@
|
||||
<p class="mb-0 small fw-medium">{{ $common.dateFormatter(item.author.createdAt) }}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 최근 작성자 (조건부) -->
|
||||
<div
|
||||
v-if="item.author.createdAt !== item.lastEditor.updatedAt"
|
||||
class="d-flex justify-content-between flex-wrap gap-2 mb-2"
|
||||
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">
|
||||
<img
|
||||
class="rounded-circle user-avatar"
|
||||
:src="getProfileImage(item.lastEditor.profileImage)"
|
||||
alt="최근 작성자"
|
||||
:style="{ borderColor: item.lastEditor.color}"
|
||||
:style="{ borderColor: item.lastEditor.color }"
|
||||
@error="setDefaultImage"
|
||||
/>
|
||||
</div>
|
||||
@ -54,6 +55,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="edit-btn">
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
</div>
|
||||
<div v-if="dataList.length === 0 || showInput">
|
||||
<FormInput
|
||||
class="me-5"
|
||||
class="me-5 parent-class "
|
||||
ref="categoryInputRef"
|
||||
title="새 카테고리"
|
||||
:isLabel="dataList.length === 0 ?true : false"
|
||||
@ -25,6 +25,7 @@
|
||||
@update:modelValue="addCategory = $event"
|
||||
:is-cate-alert="addCategoryAlert"
|
||||
@focusout="handleCategoryFocusout(addCategory)"
|
||||
|
||||
/>
|
||||
</div>
|
||||
<FormInput class="me-5"
|
||||
@ -219,4 +220,7 @@ const handleCategoryFocusout = (value) => {
|
||||
right: 0.7rem;
|
||||
top: 1.2rem;
|
||||
}
|
||||
.parent-class {
|
||||
justify-content: flex-end;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -31,6 +31,7 @@
|
||||
<!-- 단어 목록 -->
|
||||
<ul v-if="total > 0" class="ms-3 list-unstyled">
|
||||
<DictCard
|
||||
class="DictCard"
|
||||
v-for="item in wordList"
|
||||
:key="item.WRDDICSEQ"
|
||||
:item="item"
|
||||
@ -282,4 +283,9 @@
|
||||
margin-bottom: 0.5rem !important;
|
||||
}
|
||||
}
|
||||
.DictCard {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
|
||||
gap: 1rem;
|
||||
}
|
||||
</style>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user