fix message ui

src/layouts/components/ShortcutBar.vue

@@ -41,8 +41,10 @@ const chatContainer = ref<HTMLDivElement>()
 // 滚动到底部
 function scrollMessageToEnd() {
   nextTick(() => {
-    if (chatContainer.value)
-      chatContainer.value.scrollTop = chatContainer.value.scrollHeight
+    if (chatContainer.value) {
+      const scrollDiv = chatContainer.value.$el
+      scrollDiv.scrollTop = scrollDiv.scrollHeight
+    }
   })
 }
 
@@ -333,6 +335,7 @@ onMounted(() => {
           single-line
           clearable
           density="compact"
+          :disabled="sendButtonDisabled"
           @keydown.enter="sendMessage"
         >
           <template #append>

src/views/system/MessageView.vue

@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import store from '@/store'
-import MessageCard from '@/components/cards/MessageCard.vue'
 import type { Message } from '@/api/types'
+import MessageCard from '@/components/cards/MessageCard.vue'
 import api from '@/api'
 
 // 定义事件
@@ -9,10 +9,18 @@ const emit = defineEmits(['scroll'])
 
 // 消息列表
 const messages = ref<Message[]>([])
+// 当前页数据
+const currData = ref<Message[]>([])
 
 // 是否完成加载
 const isLoaded = ref(false)
 
+// 是否加载中
+const loading = ref(false)
+
+// 当前页码
+const page = ref(1)
+
 // SSE持续获取消息
 function startSSEMessager() {
   const token = store.state.auth.token
@@ -38,13 +46,36 @@ function startSSEMessager() {
 }
 
 // 调用API加载存量消息
-async function loadMessages() {
+async function loadMessages({ done }: { done: any }) {
+  // 如果正在加载中，直接返回
+  if (loading.value) {
+    done('ok')
+    return
+  }
+  // 设置加载中
+  loading.value = true
   try {
-    messages.value = await api.get('message/web')
-    if (messages.value.length > 0) {
-      isLoaded.value = true
+    currData.value = await api.get('message/web', {
+      params: {
+        page: page.value,
+        size: 20,
+      },
+    })
+    if (currData.value.length > 0) {
+      // 合并数据
+      messages.value = [...currData.value, ...messages.value]
+      // 页码+1
+      page.value++
+      // 加载完成
+      done('ok')
+      // 滚动到底部
       emit('scroll')
     }
+    else {
+      done('ok')
+    }
+    loading.value = false
+    isLoaded.value = true
   }
   catch (error) {
     console.error(error)
@@ -52,50 +83,65 @@ async function loadMessages() {
 }
 
 onMounted(() => {
-  // 加载存量消息
-  loadMessages()
   // 监听新消息
   startSSEMessager()
 })
 </script>
 
 <template>
-  <div
-    v-if="!isLoaded"
-    class="mt-5 w-full text-center flex flex-col items-center"
+  <VInfiniteScroll
+    mode="intersect"
+    side="start"
+    :items="messages"
+    class="overflow-hidden"
+    @load="loadMessages"
   >
-    <VProgressCircular
-      size="48"
-      indeterminate
-      color="primary"
-    />
-    <span class="mt-3">正在刷新 ...</span>
-  </div>
-  <div
-    v-if="messages.length === 0 && isLoaded"
-    class="w-full text-center flex flex-col items-center"
-  >
-    <span class="mb-3">当前没有消息</span>
-  </div>
-  <div>
-    <VRow
-      v-for="(msg, index) in messages"
-      :key="index"
-      :class="{
-        'justify-end': msg.action === 0,
-        'justify-start': msg.action === 1,
-      }"
-    >
-      <VCol
-        cols="10"
-        lg="6"
-        xl="4"
-        style="position: relative;"
+    <template #loading>
+      <VProgressCircular
+        v-if="loading"
+        indeterminate
+        size="48"
+        class="mb-5"
+        color="primary"
+      />
+    </template>
+    <div>
+      <VRow
+        v-for="(msg, index) in messages"
+        :key="index"
+        :class="{
+          'justify-end': msg.action === 0,
+          'justify-start': msg.action === 1,
+        }"
       >
-        <MessageCard
-          :message="msg"
-        />
-      </VCol>
-    </VRow>
-  </div>
+        <VCol
+          cols="10"
+          lg="6"
+          xl="4"
+          style="position: relative;"
+        >
+          <MessageCard
+            :message="msg"
+          />
+        </VCol>
+      </VRow>
+    </div>
+    <div
+      v-if="!isLoaded"
+      class="mt-5 w-full text-center flex flex-col items-center"
+    >
+      <VProgressCircular
+        size="48"
+        indeterminate
+        color="primary"
+      />
+      <span class="mt-3">正在刷新 ...</span>
+    </div>
+    <div
+      v-if="messages.length === 0 && isLoaded"
+      class="w-full text-center flex flex-col items-center"
+    >
+      <span class="mb-3">当前没有消息</span>
+    </div>
+  </VInfiniteScroll>
 </template>