Merge pull request 'yink' (#16) from yink into main

Reviewed-on: https://gitea-inner.fontree.cn/scout666/chat-pc/pulls/16
2025-07-07 07:11:01 +00:00 · 2025-07-07 07:11:01 +00:00 · 6c63946d37
commit 6c63946d37
parent 111f303b2a 13830d748b
11 changed files with 101 additions and 52 deletions
--- a/src/assets/image/bofang1.png
+++ b/src/assets/image/bofang1.png
--- a/src/assets/image/yuyin1.png
+++ b/src/assets/image/yuyin1.png
--- a/src/components/talk/ForwardRecord.vue
+++ b/src/components/talk/ForwardRecord.vue
@ -50,13 +50,12 @@ const dropdown=ref({
  options:[] as any,
  item:{} as ITalkRecord,
 })
-const onConvertText =async (data: ITalkRecord) => {
+const onConvertText = async (data: ITalkRecord) => {
  data.is_convert_text = 1
-  const res = await voiceToText({msgId:data.msg_id,voiceUrl:data.extra.url})
-  if(res.code == 200){
+  const res = await voiceToText({ msgId: data.msg_id, voiceUrl: data.extra.url })
+  if (res.code == 200) {
    data.extra.content = res.data.convText
-
-  }
+  }else data.is_convert_text = 0
 }
 const onloseConvertText=(data: ITalkRecord)=>{
  data.is_convert_text = 0
@ -96,29 +95,29 @@ const onContextMenu = (e:any,item: ITalkRecord) => {
  <customModal   :closable="false" customCloseBtn v-model:show="isShow"   :title="title" style="width: 997px;background-color: #F9F9FD;"   :on-after-leave="onMaskClick">
    <template #content>
      <div class="main-box bg-#fff me-scrollbar me-scrollbar-thumb">
-      <Loading v-if="items.length === 0" />
+        <Loading v-if="items.length === 0" />

-      <div v-for="item in items" :key="item.msg_id" class="message-item">
-        <div class="left-box pointer" @click="showUserInfoModal(item.erp_user_id)">
-          <im-avatar :src="item.avatar" :size="38" :username="item.nickname" />
-        </div>
-
-        <div class="right-box">
-          <div class="msg-header">
-            <span class="name">{{ item.nickname }}</span>
-            <span class="time"> {{ item.created_at }}</span>
+        <div v-for="item in items" :key="item.msg_id" class="message-item">
+          <div class="left-box pointer" @click="showUserInfoModal(item.erp_user_id)">
+            <im-avatar :src="item.avatar" :size="38" :username="item.nickname" />
          </div>

-          <component
+          <div class="right-box">
+            <div class="msg-header">
+              <span class="name">{{ item.nickname }}</span>
+              <span class="time"> {{ item.created_at }}</span>
+            </div>
+
+            <component
          @contextmenu.prevent="onContextMenu($event,item)"
-            :is="MessageComponents[item.msg_type] || 'unknown-message'"
-            :extra="item.extra"
-            :data="item"
-          />
+              :is="MessageComponents[item.msg_type] || 'unknown-message'"
+              :extra="item.extra"
+              :data="item"
+            />
+          </div>
        </div>
      </div>
-    </div>
-     <!-- 右键菜单 -->
+      <!-- 右键菜单 -->
  <n-dropdown :show="dropdown.show" :x="dropdown.x" :y="dropdown.y" style="width: 142px;" :options="dropdown.options"
    @select="onContextMenuHandle" @clickoutside="closeDropdownMenu" />
    </template>
--- a/src/components/talk/message/AudioMessage.vue
+++ b/src/components/talk/message/AudioMessage.vue
@ -1,7 +1,14 @@
 <script lang="ts" setup>
-import { ref, reactive } from 'vue'
+import { ref, reactive, computed } from 'vue'
 import { PlayOne, PauseOne } from '@icon-park/vue-next'
 import { ITalkRecordExtraAudio, ITalkRecord } from '@/types/chat'
+import { onClickOutside } from '@vueuse/core'
+import { useTemplateRef } from 'vue'
+import yuyin from "@/assets/image/yuyin.png"
+import yuyin1 from "@/assets/image/yuyin1.png"
+import bofang from "@/assets/image/bofang.png"
+import bofang1 from "@/assets/image/bofang1.png"
+

 const props = defineProps<{
  extra: ITalkRecordExtraAudio
@ -22,16 +29,23 @@ const state = reactive({
  showText: false
 })

+const target = useTemplateRef<HTMLElement>('target')
 const onPlay = () => {
  if (state.isAudioPlay) {
    audioRef.value.pause()
+    state.isAudioPlay = false
  } else {
    audioRef.value.play()
+    state.isAudioPlay = true
+    onClickOutside(target, () => {
+      console.log('点击了外部区域')
+      audioRef.value.pause() // 关闭当前语音播放
+      state.isAudioPlay = false
+    })
  }
-
-  state.isAudioPlay = !state.isAudioPlay
 }

+
 const onPlayEnd = () => {
  state.isAudioPlay = false
  state.progress = 0
@ -70,10 +84,18 @@ const formatTime = (value: number = 0) => {

  return `${Math.floor(value)}"`
 }
+const right = computed(() => props.data.float === 'right')
 </script>
 <template>
-  <div class="pointer w-200px bg-#F3F4FD rounded-10px px-11px">
-    <div class="im-message-audio h-44px">
+  <div
+    class="pointer w-200px bg-#F3F4FD rounded-10px px-11px"
+    :class="{
+      '!bg-[var(--im-message-right-bg-color)] !text-[var(--im-message-right-text-color)]': right
+    }"
+    @click.stop="onPlay"
+    ref="target"
+  >
+    <div class="im-message-audio h-44px" :class="{ right }">
      <aTrumpet :isPlay="false" color="black" :size="30"></aTrumpet>
      <audio
        ref="audioRef"
@ -87,15 +109,16 @@ const formatTime = (value: number = 0) => {
      />

      <div class="play">
-        <div class="btn pointer" @click.stop="onPlay">
+        <div class="btn pointer">
          <!-- <n-icon :size="18" :component="state.isAudioPlay ? PauseOne : PlayOne" /> -->
          <img
            v-if="!state.isAudioPlay"
-            src="@/assets/image/yuyin.png"
+            :src="right ? yuyin1 : yuyin"
            class="w-[16px] h-[16px]"
            alt=""
+            :style="{ transform: right && 'rotate(180deg)' }"
          />
-          <img v-else src="@/assets/image/bofang.png" class="w-[16px] h-[16px]" alt="" />
+          <img v-else  :src="right ? bofang1 : bofang" class="w-[16px] h-[16px]" alt="" />
        </div>
      </div>
      <!-- <div class="desc">
@ -129,6 +152,9 @@ const formatTime = (value: number = 0) => {
  </div>
 </template>
 <style lang="less" scoped>
+.right {
+  flex-direction: row-reverse !important;
+}
 .im-message-audio {
  --audio-bg-color: #f5f5f5;
  --audio-btn-bg-color: #ffffff;
--- a/src/components/user/ContactModal.vue
+++ b/src/components/user/ContactModal.vue
@ -170,7 +170,7 @@ if(newVal){
        <div class="w-260px h-517px rounded-4px border-1px border-solid border-#E5E5E5 px-12px">
          <div class="border-b-2px border-b-solid border-b-#FBFBFB h-35px flex items-center justify-end">
            <n-button text color="#46299D" class="text-14px" @click="changeSelectType">
-              {{ selectType === 1 ? '多选' : '单选' }}
+              {{ selectType === 1 ? '多选' : '取消多选' }}
            </n-button>
          </div>
          <div>
@ -190,9 +190,10 @@ if(newVal){
              :customStyle="{width:'42px',height:'42px'}"></avatarModule>
                    <!-- <n-image class="w-42px h-42px rounded-full" :src="item.avatar" /> -->
                  </div>
-                  <div class="flex items-center">
+                  <div class="flex items-center overflow-hidden flex">
                    <span class="text-ellipsis">{{ item.name }}</span>
-                    <span v-if="item.type == 2" class="badge group ml-2">群</span>
+                    <!-- <span v-if="item.type == 2" class="badge group ml-2">群</span> -->
+                    <span v-if="item.talk_type === 2" class="flex-shrink-0">{{ `(${item.group_member_num})` }}</span>
                  </div>
                </div>
              </template>
@ -217,9 +218,10 @@ if(newVal){
              :groupType="item.group_type"
              :customStyle="{width:'42px',height:'42px'}"></avatarModule>
                    </div>
-                    <div class="flex items-center">
+                    <div class="flex items-center overflow-hidden flex">
                      <span class="text-ellipsis">{{ item.name }}</span>
-                      <span v-if="item.type == 2" class="badge group ml-2">群</span>
+                      <!-- <span v-if="item.type == 2" class="badge group ml-2">群</span> -->
+                      <span v-if="item.talk_type === 2" class="flex-shrink-0">{{ `(${item.group_member_num})` }}</span>
                    </div>
                    <n-button class="ml-auto" text color="#C7C7C9" @click="onRemoveContact(item)">
                      <n-icon :component="CloseCircle" size="18" />
--- a/src/event/talk.js
+++ b/src/event/talk.js
@ -259,10 +259,16 @@ class Talk extends Base {
      updated_at: parseTime(new Date())
    })

-    if (this.talk_type == 1 && this.getAccountId() !== this.sender_id) {
+    if (this.getAccountId() !== this.sender_id) {
      ServeClearTalkUnreadNum({
-        talk_type: 1,
-        receiver_id: this.sender_id
+        talk_type: this.talk_type,
+        receiver_id: this.talk_type == 1 ? this.sender_id : this.receiver_id
+      }).then(() => {
+        useTalkStore().updateItem({
+          index_name: item.index_name,
+          unread_num: 0,
+          atsign_num: 0
+        })
      })
    }
  }
--- a/src/hooks/useSessionMenu.ts
+++ b/src/hooks/useSessionMenu.ts
@ -77,11 +77,11 @@ export function useSessionMenu() {
      //   key: 'delete_contact'
      // })
    } else {
-      options.push({
+      // options.push({
      
-        label: '退出群聊',
-        key: 'signout_group'
-      })
+      //   label: '退出群聊',
+      //   key: 'signout_group'
+      // })
    }

    dropdown.options = [...options]
--- a/src/store/modules/uploads.ts
+++ b/src/store/modules/uploads.ts
@ -150,7 +150,7 @@ export const useUploadsStore = defineStore('uploads', {
        }
      } catch (error) {
        console.error("初始化分片上传失败:", error);
-        message.error("初始化上传失败，请重试")
+        message.error("上传失败，请重试")
        this.handleUploadError(upload_id, clientUploadId)
      }
    },
--- a/src/views/message/inner/panel/PanelContent.vue
+++ b/src/views/message/inner/panel/PanelContent.vue
@ -325,7 +325,7 @@ const onConvertText = async (data: ITalkRecord) => {
  const res = await voiceToText({ msgId: data.msg_id, voiceUrl: data.extra.url })
  if (res.code == 200) {
    data.extra.content = res.data.convText
-  }
+  } else data.is_convert_text = 0
 }
 const onloseConvertText = (data: ITalkRecord) => {
  data.is_convert_text = 0
@ -354,6 +354,10 @@ const onRowClick = (item: ITalkRecord) => {
    if (!isOneMonthBefore(item.created_at.split(' ')[0])) {
      return useMessage.info('只支持转发近一个月内的消息')
    }
+    // 语音消息和群公告不支持转发
+    if ([4, 13].includes(item.msg_type)) {
+      return useMessage.info('语音消息和群公告不支持转发')
+    }
    console.log('item.msg_type', item.msg_type)
    if (ForwardableMessageType.includes(item.msg_type)) {
      item.isCheck = !item.isCheck
@ -435,12 +439,15 @@ const retry = (item: any) => {
  confirmBox({
    content: '确定重发吗'
  }).then(() => {
+    item.extra.percentage = 0
    uploadsStore.retryCommonUpload(item.extra.upload_id)
  })
 }

 const onContextMenuAvatar = (e: any, item: any) => {
  e.preventDefault()
+  // 单聊不需要@
+  if (+props.talk_type === 1) return
  if (item.float !== 'right') {
    bus.emit(EditorConst.Mention, {
      id: item.user_id,
@ -840,7 +847,7 @@ const onCustomSkipBottomEvent = () => {
            <!-- 近一个月外的消息多选框禁用 {{ item }} -->
            <n-checkbox
              size="small"
-              :disabled="!isOneMonthBefore(item.created_at.split(' ')[0])"
+              :disabled="!isOneMonthBefore(item.created_at.split(' ')[0]) || [4, 13].includes(item.msg_type)"
              :checked="item.isCheck"
              @update:checked="item.isCheck = !item.isCheck"
            />
@ -940,7 +947,13 @@ const onCustomSkipBottomEvent = () => {
            </div>

            <!-- 已读回执 -->
-            <div class="talk_read_num" v-if="item.user_id === props.uid">
+            <!-- item.user_id:发送这条消息的人id -->
+            <!-- props.uid:当前登录人id -->
+            <!-- props.receiver_id:当前消息要发送的人id -->
+            <div
+              class="talk_read_num"
+              v-if="item.user_id === props.uid && props.uid !== props.receiver_id"
+            >
              <span v-if="props.talk_type === 1">{{
                item.read_total_num > 0 ? '已读' : '未读'
              }}</span>
--- a/src/views/message/inner/panel/PanelFooter.vue
+++ b/src/views/message/inner/panel/PanelFooter.vue
@ -66,7 +66,7 @@ const onSendMessage = (data = {}, callBack: any) => {
      if (code == 200) {
        callBack(true)
      } else {
-        window['$message'].warning(message || msg)
+        // window['$message'].warning(message || msg)
      }
    })
    .catch(() => {
--- a/src/views/message/inner/panel/menu.ts
+++ b/src/views/message/inner/panel/menu.ts
@ -71,11 +71,14 @@ export function useMenu() {
      dropdown.options.push({ label: '复制', key: 'copy' })
    }

-    if (isOneMonthBefore(new Date(item.created_at.split(' ')[0]))) {
-      // 根据时间判断只有近一个月内的消息才能支持多选
+    if (isOneMonthBefore(new Date(item.created_at.split(' ')[0])) && ![4,13].includes(item.msg_type)) {
+      // 根据时间判断只有近一个月内的消息才能支持多选  // 语音消息和群公告不支持转发
      dropdown.options.push({ label: '多选', key: 'multiSelect' })
    }
-    dropdown.options.push({ label: '引用', key: 'quote' })
+    if (isOneMonthBefore(new Date(item.created_at.split(' ')[0]))) {
+      // 根据时间判断只有近一个月内的消息才能支持引用
+      dropdown.options.push({ label: '引用', key: 'quote' })
+    }
    if (canAddRevokeOption(uid, item, (dialogueStore.groupInfo as any).is_manager)) {
      dropdown.options.push({ label: '撤回', key: 'revoke' });
    }