mirror of
https://github.com/nagisa77/OpenIsle.git
synced 2026-02-21 22:41:05 +08:00
Compare commits
4 Commits
feature/me
...
feature/ch
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2288522372 | ||
|
|
a6d8add5fa | ||
|
|
ad481cffca | ||
|
|
68a82fa2ec |
@@ -36,7 +36,11 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="item.replyTo" class="reply-preview info-content-text">
|
<div v-if="item.replyTo" class="reply-preview info-content-text">
|
||||||
<div class="reply-author">{{ item.replyTo.sender.username }}</div>
|
<div class="reply-header">
|
||||||
|
<next class="reply-icon" />
|
||||||
|
<BaseImage class="reply-avatar" :src="item.replyTo.sender.avatar" alt="avatar" />
|
||||||
|
<div class="reply-author">{{ item.replyTo.sender.username }}:</div>
|
||||||
|
</div>
|
||||||
<div class="reply-content" v-html="renderMarkdown(item.replyTo.content)"></div>
|
<div class="reply-content" v-html="renderMarkdown(item.replyTo.content)"></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="message-content">
|
<div class="message-content">
|
||||||
@@ -63,11 +67,21 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="message-input-area">
|
<div class="message-input-area">
|
||||||
|
<div
|
||||||
|
v-if="newMessagesCount > 0 && !isUserNearBottom"
|
||||||
|
class="new-message-container"
|
||||||
|
@click="handleScrollToBottom"
|
||||||
|
>
|
||||||
|
<double-down />
|
||||||
|
<div class="new-message-count">有{{ newMessagesCount }}条新消息</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div v-if="replyTo" class="active-reply">
|
<div v-if="replyTo" class="active-reply">
|
||||||
正在回复 {{ replyTo.sender.username }}:
|
正在回复 {{ replyTo.sender.username }}:
|
||||||
{{ stripMarkdownLength(replyTo.content, 50) }}
|
{{ stripMarkdownLength(replyTo.content, 50) }}
|
||||||
<close-icon class="close-reply" @click="replyTo = null" />
|
<close-icon class="close-reply" @click="replyTo = null" />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<MessageEditor :loading="sending" @submit="sendMessage" />
|
<MessageEditor :loading="sending" @submit="sendMessage" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -120,6 +134,7 @@ const isChannel = ref(false)
|
|||||||
const isFloatMode = computed(() => route.query.float !== undefined)
|
const isFloatMode = computed(() => route.query.float !== undefined)
|
||||||
const floatRoute = useState('messageFloatRoute')
|
const floatRoute = useState('messageFloatRoute')
|
||||||
const replyTo = ref(null)
|
const replyTo = ref(null)
|
||||||
|
const newMessagesCount = ref(0)
|
||||||
|
|
||||||
const isUserNearBottom = ref(true)
|
const isUserNearBottom = ref(true)
|
||||||
function updateNearBottom() {
|
function updateNearBottom() {
|
||||||
@@ -127,6 +142,9 @@ function updateNearBottom() {
|
|||||||
if (!el) return
|
if (!el) return
|
||||||
const threshold = 40 // px
|
const threshold = 40 // px
|
||||||
isUserNearBottom.value = el.scrollHeight - el.scrollTop - el.clientHeight <= threshold
|
isUserNearBottom.value = el.scrollHeight - el.scrollTop - el.clientHeight <= threshold
|
||||||
|
if (isUserNearBottom.value) {
|
||||||
|
newMessagesCount.value = 0
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const hasMoreMessages = computed(() => currentPage.value < totalPages.value - 1)
|
const hasMoreMessages = computed(() => currentPage.value < totalPages.value - 1)
|
||||||
@@ -170,6 +188,11 @@ function scrollToBottomInstant() {
|
|||||||
el.scrollTop = el.scrollHeight
|
el.scrollTop = el.scrollHeight
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function handleScrollToBottom() {
|
||||||
|
scrollToBottomSmooth()
|
||||||
|
newMessagesCount.value = 0
|
||||||
|
}
|
||||||
|
|
||||||
async function fetchMessages(page = 0) {
|
async function fetchMessages(page = 0) {
|
||||||
if (page === 0) {
|
if (page === 0) {
|
||||||
loading.value = true
|
loading.value = true
|
||||||
@@ -301,6 +324,7 @@ async function sendMessage(content, clearInput) {
|
|||||||
await nextTick()
|
await nextTick()
|
||||||
// 仅“发送消息成功后”才平滑滚动到底部
|
// 仅“发送消息成功后”才平滑滚动到底部
|
||||||
scrollToBottomSmooth()
|
scrollToBottomSmooth()
|
||||||
|
newMessagesCount.value = 0
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
toast.error(e.message)
|
toast.error(e.message)
|
||||||
} finally {
|
} finally {
|
||||||
@@ -373,6 +397,8 @@ const subscribeToConversation = () => {
|
|||||||
|
|
||||||
if (isUserNearBottom.value) {
|
if (isUserNearBottom.value) {
|
||||||
scrollToBottomSmooth()
|
scrollToBottomSmooth()
|
||||||
|
} else {
|
||||||
|
newMessagesCount.value += 1
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error('Failed to parse websocket message', e)
|
console.error('Failed to parse websocket message', e)
|
||||||
@@ -555,6 +581,25 @@ function goBack() {
|
|||||||
gap: 10px;
|
gap: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.new-message-container {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
align-items: center;
|
||||||
|
gap: 5px;
|
||||||
|
cursor: pointer;
|
||||||
|
border: 1px solid var(--normal-border-color);
|
||||||
|
border-radius: 20px;
|
||||||
|
padding: 3px 6px;
|
||||||
|
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.1);
|
||||||
|
width: fit-content;
|
||||||
|
position: absolute;
|
||||||
|
bottom: calc(100% + 20px);
|
||||||
|
left: 50%;
|
||||||
|
transform: translateX(-50%);
|
||||||
|
z-index: 10;
|
||||||
|
background-color: var(--background-color);
|
||||||
|
}
|
||||||
|
|
||||||
.user-name {
|
.user-name {
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
@@ -585,11 +630,6 @@ function goBack() {
|
|||||||
border-bottom-left-radius: 4px;
|
border-bottom-left-radius: 4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.message-input-area {
|
|
||||||
margin-left: 20px;
|
|
||||||
margin-right: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.loading-container {
|
.loading-container {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
@@ -606,6 +646,19 @@ function goBack() {
|
|||||||
.message-input-area {
|
.message-input-area {
|
||||||
margin-left: 10px;
|
margin-left: 10px;
|
||||||
margin-right: 10px;
|
margin-right: 10px;
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.reply-icon {
|
||||||
|
color: var(--primary-color);
|
||||||
|
margin-right: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.reply-avatar {
|
||||||
|
width: 20px;
|
||||||
|
height: 20px;
|
||||||
|
border-radius: 50%;
|
||||||
|
margin-right: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.reply-preview {
|
.reply-preview {
|
||||||
@@ -617,9 +670,16 @@ function goBack() {
|
|||||||
background-color: var(--normal-light-background-color);
|
background-color: var(--normal-light-background-color);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.reply-header {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
.reply-author {
|
.reply-author {
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
margin-bottom: 2px;
|
margin-bottom: 2px;
|
||||||
|
opacity: 0.5;
|
||||||
}
|
}
|
||||||
|
|
||||||
.reply-btn {
|
.reply-btn {
|
||||||
|
|||||||
@@ -73,6 +73,7 @@ import {
|
|||||||
RobotOne,
|
RobotOne,
|
||||||
Server,
|
Server,
|
||||||
Protection,
|
Protection,
|
||||||
|
DoubleDown,
|
||||||
} from '@icon-park/vue-next'
|
} from '@icon-park/vue-next'
|
||||||
|
|
||||||
export default defineNuxtPlugin((nuxtApp) => {
|
export default defineNuxtPlugin((nuxtApp) => {
|
||||||
@@ -149,4 +150,5 @@ export default defineNuxtPlugin((nuxtApp) => {
|
|||||||
nuxtApp.vueApp.component('RobotOne', RobotOne)
|
nuxtApp.vueApp.component('RobotOne', RobotOne)
|
||||||
nuxtApp.vueApp.component('ServerIcon', Server)
|
nuxtApp.vueApp.component('ServerIcon', Server)
|
||||||
nuxtApp.vueApp.component('Protection', Protection)
|
nuxtApp.vueApp.component('Protection', Protection)
|
||||||
|
nuxtApp.vueApp.component('DoubleDown', DoubleDown)
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user