src/components/talk/message/RevokeMessage.vue

@@ -4,72 +4,39 @@ import { formatTime } from '@/utils/datetime'
 defineProps({
   login_uid: {
     type: Number,
-    default: 0,
+    default: 0
   },
   user_id: {
     type: Number,
-    default: 0,
+    default: 0
   },
   talk_type: {
     type: Number,
-    default: 0,
+    default: 0
   },
   nickname: {
     type: String,
-    default: '',
+    default: ''
   },
   datetime: {
     type: String,
-    default: '',
+    default: ''
   },
   msg_id: {
     type: String,
-    default: '',
-  },
-  revokeInfo: {
-    type: Object,
-    default() {
-      return {}
-    },
-  },
-  extra:{
-    type: String,
-    default: '',
+    default: ''
   }
 })
 </script>
 <template>
   <div class="im-message-revoke">
-    <div class="content" v-if="JSON.stringify(revokeInfo) !== '{}'">
-      <span v-if="talk_type === 1 && login_uid === revokeInfo.withdraw_id">
-        你撤回了一条消息 | {{ formatTime(datetime) }}
-        <slot></slot>
-        <!-- 添加插槽用于放置重新编辑按钮 -->
+    <div class="content">
+      <span v-if="login_uid == user_id"> 你撤回了一条消息 | {{ formatTime(datetime) }}
+        <slot></slot> <!-- 添加插槽用于放置重新编辑按钮 -->
       </span>
-      <span v-if="talk_type === 1 && login_uid !== revokeInfo.withdraw_id">
-        {{revokeInfo.withdraw_name}}撤回了一条消息 | {{ formatTime(datetime) }}
-      </span>
-      <span v-if="talk_type === 2 && login_uid === revokeInfo.withdraw_id && login_uid === revokeInfo.retracted_id">
-        你撤回了一条消息 |
-        {{ formatTime(datetime) }}
-        <slot></slot>
-      </span>
-      <span v-if="talk_type === 2 && login_uid === revokeInfo.withdraw_id && login_uid !== revokeInfo.retracted_id">
-        你撤回了{{revokeInfo.retracted_name}}一条消息 |
-        {{ formatTime(datetime) }}
-      </span>
-      <span v-if="talk_type === 2 && login_uid !== revokeInfo.withdraw_id && revokeInfo.withdraw_id === revokeInfo.retracted_id">
-        {{revokeInfo.withdraw_name}}撤回了一条消息 |
-        {{ formatTime(datetime) }}
-      </span>
-
-      <span v-if="talk_type === 2 && login_uid !== revokeInfo.withdraw_id && login_uid === revokeInfo.retracted_id && revokeInfo.withdraw_id !== revokeInfo.retracted_id">
-        {{revokeInfo.withdraw_name}}撤回了你一条消息 |
-        {{ formatTime(datetime) }}
-        {{extra}}
-      </span>
-      <span v-if="talk_type === 2 && login_uid !== revokeInfo.withdraw_id && login_uid !== revokeInfo.retracted_id && revokeInfo.withdraw_id !== revokeInfo.retracted_id">
-        {{revokeInfo.withdraw_name}}撤回了{{revokeInfo.retracted_name}}一条消息 |
+      <span v-else-if="talk_type == 1">"{{ nickname }}" 撤回了一条消息 | {{ formatTime(datetime) }} </span>
+      <span v-else>
+        "{{ nickname }}" 撤回了一条消息 |
         {{ formatTime(datetime) }}
       </span>
 
@@ -77,27 +44,6 @@ defineProps({
       <span v-else-if="login_uid == user_idB"> A撤回你了一条消息 | {{ formatTime(datetime) }} </span>
       <span v-else> A撤回B了一条消息 | {{ formatTime(datetime) }} </span> -->
     </div>
-    <div class="content" v-if="JSON.stringify(revokeInfo) === '{}'">
-      <span v-if="talk_type === 1 && login_uid === user_id">
-        你撤回了一条消息 | {{ formatTime(datetime) }}
-        <slot></slot>
-        <!-- 添加插槽用于放置重新编辑按钮 -->
-      </span>
-      <span v-if="talk_type === 1 && login_uid !== user_id">
-        {{nickname}}撤回了一条消息 | {{ formatTime(datetime) }}
-      </span>
-      <span v-if="talk_type === 2 && !extra && login_uid === user_id">
-        你撤回了一条消息 | {{ formatTime(datetime) }}
-        <slot></slot>
-        <!-- 添加插槽用于放置重新编辑按钮 -->
-      </span>
-      <span v-if="talk_type === 2 && !extra && login_uid !== user_id">
-        {{nickname}}撤回了一条消息 | {{ formatTime(datetime) }}
-      </span>
-      <span v-if="talk_type === 2 && extra">
-        {{extra}} | {{ formatTime(datetime) }}
-      </span>
-    </div>
   </div>
 </template>
 <style lang="less" scoped>

src/event/revoke.js

@@ -68,38 +68,20 @@ class Revoke extends Base {
   }
 
   handle() {
-    const { updateDialogueRecord } = useDialogueListStore()
+    const {updateDialogueRecord} = useDialogueListStore()
     useTalkStore().updateItem({
       index_name: this.getIndexName(),
       msg_text: this.resource.text,
-      revokeInfo: {
-        retracted_id: this.resource.retracted_id,
-        retracted_name: this.resource.retracted_name,
-        withdraw_id: this.resource.withdraw_id,
-        withdraw_name: this.resource.withdraw_name,
-      },
-      updated_at: parseTime(new Date()),
+      updated_at: parseTime(new Date())
     })
 
     useDialogueStore().updateDialogueRecord({
       msg_id: this.msg_id,
-      revokeInfo: {
-        retracted_id: this.resource.retracted_id,
-        retracted_name: this.resource.retracted_name,
-        withdraw_id: this.resource.withdraw_id,
-        withdraw_name: this.resource.withdraw_name,
-      },
-      is_revoke: 1,
+      is_revoke: 1
     })
     updateDialogueRecord({
       msg_id: this.msg_id,
-      revokeInfo: {
-        retracted_id: this.resource.retracted_id,
-        retracted_name: this.resource.retracted_name,
-        withdraw_id: this.resource.withdraw_id,
-        withdraw_name: this.resource.withdraw_name,
-      },
-      is_revoke: 1,
+      is_revoke: 1
     })
   }
 }

src/pages/dialog/index.vue

@@ -72,8 +72,6 @@
               :talk_type="item.talk_type"
               :datetime="item.created_at"
               :msg_id="item.msg_id"
-              :revokeInfo="item.revokeInfo"
-              :extra="item.extra"
             >
               <template
                 v-if="

src/pages/search/searchByCondition/index.vue

@@ -443,8 +443,6 @@ const getDArray = (dArray) => {
 //输入搜索内容
 const inputSearchText = (e) => {
   state.searchText = e
-  state.cursor = 0
-  queryAllSearch()
 }
 
 //点击取消搜索
@@ -467,7 +465,6 @@ const queryAllSearch = () => {
     start_time: '',
     end_time: '',
     group_member_user_id: 0, //群成员id，当查询群历史消息的时候，需要指定群成员的时候送
-    file_name: state.msg_type === 6 ? state.searchText : '',
   }
   console.log(params)
   const resp = ServeFindTalkRecords(params)
@@ -475,8 +472,7 @@ const queryAllSearch = () => {
   resp.then(({ code, data }) => {
     console.log(data)
     if (code == 200) {
-      // 当cursor为0时，清空searchResultList
-      let dateList = state.cursor === 0 ? [] : state.searchResultList
+      let dateList = state.searchResultList
       let noMore = false
       if (data?.items?.length > 0) {
         data.items.forEach((item) => {
@@ -522,26 +518,14 @@ const queryAllSearch = () => {
         noMore = true
       }
       console.log(dateList)
-      if (state.cursor === 0) {
-        state.searchResultList = dateList
-        zPaging.value?.complete(dateList)
-      } else {
-        state.searchResultList = dateList
-        zPaging.value?.completeByNoMore(dateList, noMore)
-      }
       state.cursor = data?.cursor
+      zPaging.value?.completeByNoMore(dateList, noMore)
     } else {
-      if (state.cursor === 0) {
-        state.searchResultList = []
-      }
       zPaging.value?.complete([])
     }
   })
 
   resp.catch(() => {
-    if (state.cursor === 0) {
-      state.searchResultList = []
-    }
     zPaging.value?.complete([])
   })
 }

src/store/modules/dialogueList.js

@@ -107,17 +107,15 @@ export const useDialogueListStore = createGlobalState(() => {
   const addChatRecord = (indexName, item) => {
     const dialogue = lodash.cloneDeep(useDialogueStore())
     if (dialogue?.index_name === indexName) {
-      if (item?.file_num) {
-        const index = virtualList.value.findIndex(
-          (v) => v?.file_num === item?.file_num,
-        )
-        if (index > -1) {
-          // 保持响应性的同时替换整个对象
-          virtualList.value.splice(index, 1, {
-            ...virtualList.value[index], // 保留原有不需要修改的字段
-            ...item, // 覆盖需要更新的字段
-          })
-        }
+      const index = virtualList.value.findIndex(
+        (v) => v?.file_num === item?.file_num,
+      )
+      if (index > -1) {
+        // 保持响应性的同时替换整个对象
+        virtualList.value.splice(index, 1, {
+          ...virtualList.value[index], // 保留原有不需要修改的字段
+          ...item, // 覆盖需要更新的字段
+        })
       } else {
         zpagingRef.value?.addChatRecordData(item, false, false)
       }