Merge branch 'main' into dev

src/components/search/searchByCondition.vue

@@ -309,7 +309,8 @@ import { MessageComponents } from '@/constant/message'
 const emits = defineEmits([
   'clearSearchMemberByAlphabet',
   'getDisabledDateArray',
-  'hideSearchResultModal'
+  'hideSearchResultModal',
+  'clearSelectedDateTime'
 ])
 
 const dialogueStore = useDialogueStore()
@@ -753,6 +754,10 @@ const resetSearchConditions = (newVal) => {
     state.group_member_id = 0
     emits('clearSearchMemberByAlphabet')
   }
+  if (newVal !== 'date') {
+    state.selectedDateTime = null
+    emits('clearSelectedDateTime')
+  }
 }
 
 //触底加载更多数据
@@ -834,7 +839,6 @@ watch(
     queryAllSearch()
   },
   {
-    immediate: true,
     deep: true
   }
 )

src/views/message/inner/IndexContent.vue

@@ -485,6 +485,11 @@ const hideSearchResultModal = () => {
   handleSearchRecordByConditionModalClose()
   state.isShowGroupAside = false
 }
+
+// 清空日期选择器
+const clearSelectedDateTime = () => {
+  onDatePickClear()
+}
 </script>
 
 <template>
@@ -712,6 +717,7 @@ const hideSearchResultModal = () => {
               :selectedDateTime="state.selectedDateTime"
               :nowDateTime="state.nowDateTime"
               @hideSearchResultModal="hideSearchResultModal"
+              @clearSelectedDateTime="clearSelectedDateTime"
             />
           </div>
         </n-card>

src/views/message/inner/IndexSider.vue

@@ -89,6 +89,12 @@ const renderChatAppSearch = () => {
           state.searchRecordText = searchText
           state.selectItemInList = res
         } else {
+          if(searchResultKey === 'user_infos'){
+            talk_type = 1
+          }
+          if(searchResultKey === 'combinedGroup'){
+            talk_type = 2
+          }
           talkStore.toTalk(talk_type, receiver_id, router)
         }
         state.showSearchDropdown = false