Merge branch 'main' into dev

src/views/message/inner/IndexContent.vue

@@ -191,7 +191,7 @@ const handleGroupNoticeModalConfirm = () => {
     state.isShowNoticeHintModal = true
     if (state?.groupNoticeInfo?.id && !state.groupNoticeInEdit) {
       //如果是在编辑中，但是没有输入内容，此时点击完成即为删除群公告
-      state.noticeHintModalContent = '确定清空群公告吗？'
+      state.noticeHintModalContent = '确定清空群公告'
       state.noticeHintModalActionBtns = {
         confirmBtn: {
           text: '清空',
@@ -596,7 +596,7 @@ const hideSearchResultModal = () => {
             <n-input
               type="text"
               v-model:value="state.searchRecordByConditionText"
-              placeholder="请输入"
+              :placeholder="state.conditionTag && state.conditionTag !== 'all'?'':'请输入'"
               clearable
             >
               <template #clear-icon>

src/views/message/inner/IndexSider.vue

@@ -448,6 +448,11 @@ onMounted(() => {
 const showAddressBookModal = () => {
   state.isShowAddressBookModal = true
 }
+// 点击关闭通讯录模态框
+const closeAddressBookModal = () => {
+  state.isShowAddressBookModal = false
+  resetAddressBookModal()
+}
 const handleTreeClick = ({ selectedKey, tree }) => {
   // console.log(tree)
   state.clickKey = tree.key
@@ -840,6 +845,8 @@ const handleEnterSearchResultChat = () => {
     :style="state.customModalStyle"
     :customCloseBtn="true"
     :closable="false"
+    :customCloseEvent="true"
+    @customCloseModal="closeAddressBookModal"
   >
     <template #content>
       <div class="custom-modal-content">