package.json

@@ -20,7 +20,6 @@
     "@iconify-json/ion": "^1.2.3",
     "@kangc/v-md-editor": "^2.3.18",
     "@onlyoffice/document-editor-vue": "^1.5.0",
-    "@soerenmartius/vue3-clipboard": "^0.1.2",
     "@tiptap/core": "^2.23.1",
     "@tiptap/extension-blockquote": "^2.23.1",
     "@tiptap/extension-emoji": "^2.23.1",

pnpm-lock.yaml

@@ -26,9 +26,6 @@ importers:
       '@onlyoffice/document-editor-vue':
         specifier: ^1.5.0
         version: 1.5.0(vue@3.5.17(typescript@5.2.2))
-      '@soerenmartius/vue3-clipboard':
-        specifier: ^0.1.2
-        version: 0.1.2
       '@tiptap/core':
         specifier: ^2.23.1
         version: 2.23.1(@tiptap/pm@2.23.1)
@@ -901,9 +898,6 @@ packages:
     resolution: {integrity: sha512-tlqY9xq5ukxTUZBmoOp+m61cqwQD5pHJtFY3Mn8CA8ps6yghLH/Hw8UPdqg4OLmFW3IFlcXnQNmo/dh8HzXYIQ==}
     engines: {node: '>=18'}
 
-  '@soerenmartius/vue3-clipboard@0.1.2':
-    resolution: {integrity: sha512-a5er6cFGcFIQ/3qg6kWvU0yFqIz9iWoQGEVs9azjevyRyMAKvj1w3JuLH9y6+u0WhMNby3kn7nuR8nktSnDesg==}
-
   '@tiptap/core@2.23.1':
     resolution: {integrity: sha512-EURGKGsEPrwxvOPi9gA+BsczvsECJNV+xgTAGWHmEtU4YJ0AulYrCX3b7FK+aiduVhThIHDoG/Mmvmb/HPLRhQ==}
     peerDependencies:
@@ -1619,9 +1613,6 @@ packages:
     resolution: {integrity: sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==}
     engines: {node: '>=0.10.0'}
 
-  clipboard@2.0.11:
-    resolution: {integrity: sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==}
-
   cliui@8.0.1:
     resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==}
     engines: {node: '>=12'}
@@ -2356,9 +2347,6 @@ packages:
     resolution: {integrity: sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==}
     engines: {node: '>=6'}
 
-  good-listener@1.2.2:
-    resolution: {integrity: sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==}
-
   gopd@1.2.0:
     resolution: {integrity: sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==}
     engines: {node: '>= 0.4'}
@@ -3370,9 +3358,6 @@ packages:
   seemly@0.3.10:
     resolution: {integrity: sha512-2+SMxtG1PcsL0uyhkumlOU6Qo9TAQ/WyH7tthnPIOQB05/12jz9naq6GZ6iZ6ApVsO3rr2gsnTf3++OV63kE1Q==}
 
-  select@1.1.2:
-    resolution: {integrity: sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==}
-
   semver@5.7.2:
     resolution: {integrity: sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==}
     hasBin: true
@@ -3558,9 +3543,6 @@ packages:
     resolution: {integrity: sha512-B71/4oyj61iNH0KeCamLuE2rmKuTO5byTOSVwECM5FA7TiAiAW+UqTKZ9ERueC4qvgSttUhdmq1mXC3kJqGX7A==}
     engines: {node: '>=12.22'}
 
-  tiny-emitter@2.1.0:
-    resolution: {integrity: sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==}
-
   tinyexec@1.0.1:
     resolution: {integrity: sha512-5uC6DDlmeqiOwCPmK9jMSdOuZTh8bU39Ys6yidB+UTt5hfZUPGAypSgFRiEp+jbi9qH40BLDvy85jIU88wKSqw==}
 
@@ -4577,10 +4559,6 @@ snapshots:
 
   '@sindresorhus/merge-streams@4.0.0': {}
 
-  '@soerenmartius/vue3-clipboard@0.1.2':
-    dependencies:
-      clipboard: 2.0.11
-
   '@tiptap/core@2.23.1(@tiptap/pm@2.23.1)':
     dependencies:
       '@tiptap/pm': 2.23.1
@@ -5540,12 +5518,6 @@ snapshots:
       isobject: 3.0.1
       static-extend: 0.1.2
 
-  clipboard@2.0.11:
-    dependencies:
-      good-listener: 1.2.2
-      select: 1.1.2
-      tiny-emitter: 2.1.0
-
   cliui@8.0.1:
     dependencies:
       string-width: 4.2.3
@@ -6327,10 +6299,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  good-listener@1.2.2:
-    dependencies:
-      delegate: 3.2.0
-
   gopd@1.2.0: {}
 
   graceful-fs@4.2.11: {}
@@ -7462,8 +7430,6 @@ snapshots:
 
   seemly@0.3.10: {}
 
-  select@1.1.2: {}
-
   semver@5.7.2:
     optional: true
 
@@ -7643,8 +7609,6 @@ snapshots:
 
   throttle-debounce@5.0.2: {}
 
-  tiny-emitter@2.1.0: {}
-
   tinyexec@1.0.1: {}
 
   tinyglobby@0.2.14:

src/components/editor/MentionList.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="dropdown-menu" ref="dropdownMenuRef">
+  <div class="dropdown-menu">
     <n-virtual-list
       ref="virtualListRef"
       style="max-height: 240px"
@@ -20,7 +20,7 @@
 </template>
 
 <script setup>
-import { ref, watch, defineProps, defineExpose, onMounted, onUnmounted } from 'vue'
+import { ref, watch, defineProps, defineExpose } from 'vue'
 
 const props = defineProps({
   items: {
@@ -35,40 +35,6 @@ const props = defineProps({
 
 const selectedIndex = ref(0)
 const virtualListRef = ref(null)
-const dropdownMenuRef = ref(null)
-
-let observer = null
-
-let isViewport = ref(true)
-const handleIntersection = (entries, observer) => {
-  entries.forEach(entry => {
-    if (entry.isIntersecting) {
-      isViewport.value = true
-      // 在这里处理元素可见的逻辑
-    } else {
-      isViewport.value = false
-      // 在这里处理元素不可见的逻辑
-    }
-  })
-}
-onMounted(() => {
-  observer = new IntersectionObserver(handleIntersection, {
-    root: null, // null 值表示视口
-    rootMargin: '0px',
-    threshold: 0.1 // 元素至少有 10% 可见时触发回调
-  })
-
-  if (dropdownMenuRef.value) {
-    observer.observe(dropdownMenuRef.value)
-  }
-})
-
-onUnmounted(() => {
-  if (observer && dropdownMenuRef.value) {
-    observer.unobserve(dropdownMenuRef.value)
-    observer.disconnect()
-  }
-})
 
 watch(
   () => props.items,
@@ -78,8 +44,7 @@ watch(
 )
 
 const onKeyDown = ({ event }) => {
-  console.log('event', event)
+  console.log('event',event)
-  if(!isViewport.value) return false
   if (event.key === 'ArrowUp') {
     upHandler()
     return true
@@ -135,7 +100,6 @@ defineExpose({
   overflow: auto;
   padding: 0.4rem;
   position: relative;
-  
   max-height: 200px;
   width: 200px;
   button {

src/components/editor/TiptapEditor.vue

@@ -9,7 +9,7 @@ import { computePosition, flip, shift } from '@floating-ui/dom'
 import Link from '@tiptap/extension-link'
 import { Extension, Node } from '@tiptap/core'
 import { Plugin, PluginKey } from '@tiptap/pm/state'
-import { IosSend } from '@vicons/ionicons4'
+
 
 import { reactive, watch, ref, markRaw, computed, onMounted, onUnmounted, shallowRef } from 'vue'
 
@@ -61,9 +61,6 @@ const props = defineProps({
     type: Boolean,
     default: false
   },
-  uid:{
-    type: Number
-  },
   members: {
     default: () => []
   }
@@ -219,7 +216,6 @@ const editor = useEditor({
           return suggestion.items({ 
             query, 
             props: {
-              uid: props.uid,
               members: props.members,
               isGroupManager: (dialogueStore.groupInfo).is_manager
             }
@@ -240,8 +236,7 @@ const editor = useEditor({
   },
   editorProps: {
     handlePaste: (view, event) => {
-      const clipboardData = event.clipboardData || event.originalEvent.clipboardData
+      const items = (event.clipboardData || event.originalEvent.clipboardData).items
-      const items = clipboardData.items
       for (const item of items) {
         if (item.type.indexOf('image') === 0) {
           event.preventDefault()
@@ -266,7 +261,9 @@ const editor = useEditor({
                 const pos = findImagePos(tempUrl)
                 if (pos !== -1) {
                   const { tr } = view.state
-                  view.dispatch(tr.setNodeMarkup(pos, null, { src: data.ori_url }))
+                  view.dispatch(
+                    tr.setNodeMarkup(pos, null, { src: data.ori_url })
+                  )
                 }
               } else {
                 window['$message'].error(message || '图片上传失败')
@@ -282,21 +279,10 @@ const editor = useEditor({
               URL.revokeObjectURL(tempUrl)
             })
 
-          return true // Handled
+          return true
         }
       }
-
+      return false
-      // If no image was handled, check for text and paste as plain text.
-      const text = clipboardData.getData('text/plain')
-      if (text) {
-        event.preventDefault()
-        const { state, dispatch } = view
-        // dispatch(state.tr.insertContent(text).replace(/\n/g, '<br>'))
-        editor.value.commands.insertContent(text.replace(/\r/g, '').replace(/\n/g, '<br>'))
-        return true // Handled
-      }
-
-      return false // Fallback for other cases
     }
   }
 })
@@ -402,11 +388,7 @@ async function onUploadFile(e) {
 
   if (file.type.indexOf('image/') === 0) {
 
-    const form = new FormData()
+    let fn = emitCall('image_event', file, () => {})
-    form.append('file', file)
-    form.append('source', 'fonchain-chat')
-    const { data } = await uploadImg(form)
-    let fn = emitCall('image_event', { url: data.ori_url, size: file.size }, () => { })
     emit('editor-event', fn)
 
     return
@@ -531,8 +513,6 @@ function tiptapToString() {
         result += node.attrs.alt || ''
       } else if (node.type === 'hardBreak') {
         result += '\n'
-      } else if (node.type === 'image') {
-        result += '[图片]'
       }
     })
   }
@@ -716,8 +696,7 @@ function onSubscribeEdit(data) {
   editor.value.commands.clearContent(true)
   
 
-  editor.value.commands.insertContent(data.content.replace(/\n/g, '<br>'))
+  editor.value.commands.insertContent(data.content)
-
   
 
   editor.value.commands.focus('end')
@@ -796,16 +775,6 @@ useEventBus([
             <p class="tip-title">{{ nav.title }}</p>
           </div>
         </div>
-        <div class="h-[45px] flex justify-center items-center">
-          <n-button class="w-80px h-30px mr-[22px]" type="primary" @click="onSendMessage">
-            <template #icon>
-              <n-icon>
-                <IosSend />
-              </n-icon>
-            </template>
-            发送
-          </n-button>
-        </div>
       </header>
 
       <div v-if="quoteData" class="quote-card-wrapper">
@@ -993,7 +962,6 @@ html[theme-mode='dark'] {
   outline: none;
   .tiptap.ProseMirror{
     height: 100%;
-    white-space: pre-wrap;
   }
   .image-upload-loading {
     position: relative;

src/components/editor/suggestion.js

@@ -39,8 +39,6 @@ export default {
     if (props.isGroupManager) {
       list.unshift({ id: 0, nickname: '所有人', avatar: defAvatar })
     }
-    // 排除掉自己
-    list.splice(list.findIndex((item) => item.id === props.uid), 1)
 
     const filteredItems = list.filter(
       (item) => item.nickname.toLowerCase().includes(query.toLowerCase())
@@ -101,14 +99,10 @@ export default {
           this.onExit()
           return true
         }
-        if(!component?.props.items?.length){
-          return false
-        }
         return component.ref.onKeyDown(props)
       },
 
       onExit() {
-        console.log('component.element',component.element)
         component.element.remove()
         component.destroy()
       },

src/components/talk/ForwardRecord.vue

@@ -50,12 +50,13 @@ 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 })
+  const res = await voiceToText({msgId:data.msg_id,voiceUrl:data.extra.url})
-  if (res.code == 200) {
+  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
@@ -95,29 +96,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 v-for="item in items" :key="item.msg_id" class="message-item">
-          <div class="left-box pointer" @click="showUserInfoModal(item.erp_user_id)">
+        <div class="left-box pointer" @click="showUserInfoModal(item.erp_user_id)">
-            <im-avatar :src="item.avatar" :size="38" :username="item.nickname" />
+          <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>
 
-          <div class="right-box">
+          <component
-            <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'"
+            :is="MessageComponents[item.msg_type] || 'unknown-message'"
-              :extra="item.extra"
+            :extra="item.extra"
-              :data="item"
+            :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>

src/components/talk/message/AudioMessage.vue

@@ -1,14 +1,7 @@
 <script lang="ts" setup>
-import { ref, reactive, computed } from 'vue'
+import { ref, reactive } 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
@@ -29,22 +22,15 @@ 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
@@ -84,18 +70,10 @@ const formatTime = (value: number = 0) => {
 
   return `${Math.floor(value)}"`
 }
-const right = computed(() => props.data.float === 'right')
 </script>
 <template>
-  <div
+  <div class="pointer w-200px bg-#F3F4FD rounded-10px px-11px">
-    class="pointer w-200px bg-#F3F4FD rounded-10px px-11px"
+    <div class="im-message-audio h-44px">
-    :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"
@@ -109,16 +87,15 @@ const right = computed(() => props.data.float === 'right')
       />
 
       <div class="play">
-        <div class="btn pointer">
+        <div class="btn pointer" @click.stop="onPlay">
           <!-- <n-icon :size="18" :component="state.isAudioPlay ? PauseOne : PlayOne" /> -->
           <img
             v-if="!state.isAudioPlay"
-            :src="right ? yuyin1 : yuyin"
+            src="@/assets/image/yuyin.png"
             class="w-[16px] h-[16px]"
             alt=""
-            :style="{ transform: right && 'rotate(180deg)' }"
           />
-          <img v-else  :src="right ? bofang1 : bofang" class="w-[16px] h-[16px]" alt="" />
+          <img v-else src="@/assets/image/bofang.png" class="w-[16px] h-[16px]" alt="" />
         </div>
       </div>
       <!-- <div class="desc">
@@ -152,9 +129,6 @@ const right = computed(() => props.data.float === 'right')
   </div>
 </template>
 <style lang="less" scoped>
-.right {
-  flex-direction: row-reverse !important;
-}
 .im-message-audio {
   --audio-bg-color: #f5f5f5;
   --audio-btn-bg-color: #ffffff;

src/components/talk/message/TextMessage.vue

@@ -17,7 +17,7 @@ let textContent = props.extra?.content || ''
 textContent = textReplaceLink(textContent)
 
 if (props.data.talk_type == 2) {
-  textContent = textReplaceMention(textContent, float==='right'?'':'black',float==='right'?'':'')
+  textContent = textReplaceMention(textContent, float==='right'?'#462AA0':'#fff',float==='right'?'#EEE9F9':'#462AA0')
 }
 
 textContent = textReplaceEmoji(textContent)

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,10 +190,9 @@ 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 overflow-hidden flex">
+                  <div class="flex items-center">
                     <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>
@@ -218,10 +217,9 @@ if(newVal){
               :groupType="item.group_type"
               :customStyle="{width:'42px',height:'42px'}"></avatarModule>
                     </div>
-                    <div class="flex items-center overflow-hidden flex">
+                    <div class="flex items-center">
                       <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" />

src/event/talk.js

@@ -259,16 +259,10 @@ class Talk extends Base {
       updated_at: parseTime(new Date())
     })
 
-    if (this.getAccountId() !== this.sender_id) {
+    if (this.talk_type == 1 && this.getAccountId() !== this.sender_id) {
       ServeClearTalkUnreadNum({
-        talk_type: this.talk_type,
+        talk_type: 1,
-        receiver_id: this.talk_type == 1 ? this.sender_id : this.receiver_id
+        receiver_id: this.sender_id
-      }).then(() => {
-        useTalkStore().updateItem({
-          index_name: item.index_name,
-          unread_num: 0,
-          atsign_num: 0
-        })
       })
     }
   }

src/hooks/useSessionMenu.ts

@@ -77,11 +77,11 @@ export function useSessionMenu() {
       //   key: 'delete_contact'
       // })
     } else {
-      // options.push({
+      options.push({
       
-      //   label: '退出群聊',
+        label: '退出群聊',
-      //   key: 'signout_group'
+        key: 'signout_group'
-      // })
+      })
     }
 
     dropdown.options = [...options]

src/store/modules/dialogue.js

@@ -383,9 +383,6 @@ export const useDialogueStore = defineStore('dialogue', {
         
         // 从全局列表中移除
         this.globalUploadList.splice(taskIndex, 1)
-        // 移除消息记录
-
-        this.batchDelDialogueRecord([uploadId])
       }
     },
     

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)
       }
     },

src/utils/common.js

@@ -1,5 +1,4 @@
 import { createApp } from 'vue'
-import { toClipboard } from '@soerenmartius/vue3-clipboard'
 
 /**
  * 防抖函数
@@ -52,25 +51,20 @@ export function throttle(fn, delay, call = function () {}) {
  * @param {String} text 复制内容
  * @param {Function} callback 复制成功回调方法
  */
-export async function clipboard(text, callback) {
+export function clipboard(text, callback) {
   // 在wujie环境下使用主应用的clipboard
   const clipboardObj = window.__POWERED_BY_WUJIE__ 
     ? window.parent.navigator.clipboard 
     : navigator.clipboard
-  try {
+
-    clipboardObj
+  clipboardObj
-      .writeText(text)
+    .writeText(text)
-      .then(() => {
+    .then(() => {
-        callback && callback()
+      callback && callback()
-      })
+    })
-      .catch(() => {
+    .catch(() => {
-        alert('Oops, unable to copy')
+      alert('Oops, unable to copy')
-      })
+    })
-  } catch (e) {
-    console.error(e)
-    await toClipboard(text)
-    callback && callback()
-  }
 }
 
 export async function clipboardImage(src, callback) {

src/utils/request.js

@@ -48,9 +48,7 @@ request.interceptors.request.use((config) => {
   if (token) {
     config.headers['Authorization'] = `Bearer ${token}`
   }
-  if(config.url.indexOf('api/v1/upload/multipart') > -1){ 
+
-    config.timeout = 600000
-  }
   return config
 }, errorHandler)
 

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,10 +354,6 @@ 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
@@ -439,15 +435,12 @@ 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,
@@ -847,7 +840,7 @@ const onCustomSkipBottomEvent = () => {
             <!-- 近一个月外的消息多选框禁用 {{ item }} -->
             <n-checkbox
               size="small"
-              :disabled="!isOneMonthBefore(item.created_at.split(' ')[0]) || [4, 13].includes(item.msg_type)"
+              :disabled="!isOneMonthBefore(item.created_at.split(' ')[0])"
               :checked="item.isCheck"
               @update:checked="item.isCheck = !item.isCheck"
             />
@@ -947,13 +940,7 @@ const onCustomSkipBottomEvent = () => {
             </div>
 
             <!-- 已读回执 -->
-            <!-- item.user_id:发送这条消息的人id -->
+            <div class="talk_read_num" v-if="item.user_id === props.uid">
-            <!-- 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>

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(() => {
@@ -75,7 +75,7 @@ const onSendMessage = (data = {}, callBack: any) => {
 }
 
 // 发送文本消息
-const onSendTextEvent = (value: any) => {
+const onSendTextEvent = throttle((value: any) => {
   let { data, callBack } = value
 
   let message = {
@@ -93,7 +93,7 @@ const onSendTextEvent = (value: any) => {
 
     callBack(true)
   })
-}
+}, 1000)
 
 // 发送图片消息
 const onSendImageEvent = ({ data, callBack }) => {
@@ -297,7 +297,7 @@ onMounted(() => {
     <MultiSelectFooter v-if="dialogueStore.isOpenMultiSelect" />
     <!-- <Editor v-else @editor-event="onEditorEvent" :vote="talk_type == 2" :members="members" /> -->
     <!-- <CustomEditor v-else @editor-event="onEditorEvent" :vote="talk_type == 2" :members="members" /> -->
-     <TiptapEditor v-else @editor-event="onEditorEvent" :uid="uid" :vote="talk_type == 2" :members="members" />
+     <TiptapEditor v-else @editor-event="onEditorEvent" :vote="talk_type == 2" :members="members" />
   </footer>
 
   <HistoryRecord

src/views/message/inner/panel/menu.ts

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