Merge branch 'main' of http://172.16.100.91:3000/scout666/chat-pc

# Conflicts:
#	src/utils/auth.js

components.d.ts

@@ -33,6 +33,7 @@ declare module 'vue' {
     GroupNotice: typeof import('./src/components/group/GroupNotice.vue')['default']
     GroupNoticeMessage: typeof import('./src/components/talk/message/GroupNoticeMessage.vue')['default']
     GroupPanel: typeof import('./src/components/group/GroupPanel.vue')['default']
+    HighLightText: typeof import('./src/components/search/highLightText.vue')['default']
     HistoryRecord: typeof import('./src/components/talk/HistoryRecord.vue')['default']
     ImageMessage: typeof import('./src/components/talk/message/ImageMessage.vue')['default']
     LinkMessage: typeof import('./src/components/talk/message/LinkMessage.vue')['default']
@@ -51,6 +52,8 @@ declare module 'vue' {
     NAvatar: typeof import('naive-ui')['NAvatar']
     NButton: typeof import('naive-ui')['NButton']
     NCheckbox: typeof import('naive-ui')['NCheckbox']
+    NDrawer: typeof import('naive-ui')['NDrawer']
+    NDrawerContent: typeof import('naive-ui')['NDrawerContent']
     NEmpty: typeof import('naive-ui')['NEmpty']
     NIcon: typeof import('naive-ui')['NIcon']
     NImage: typeof import('naive-ui')['NImage']
@@ -65,6 +68,8 @@ declare module 'vue' {
     RevokeMessage: typeof import('./src/components/talk/message/RevokeMessage.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
+    SearchItem: typeof import('./src/components/search/searchItem.vue')['default']
+    SearchList: typeof import('./src/components/search/searchList.vue')['default']
     SysGroupAdminMessage: typeof import('./src/components/talk/message/system/SysGroupAdminMessage.vue')['default']
     SysGroupCancelMutedMessage: typeof import('./src/components/talk/message/system/SysGroupCancelMutedMessage.vue')['default']
     SysGroupCreateMessage: typeof import('./src/components/talk/message/system/SysGroupCreateMessage.vue')['default']

src/assets/css/naive-ui-adjust.less

@@ -0,0 +1,65 @@
+/* naive ui 部分样式调整*/
+/*表格排序图标颜色问题 */
+.n-data-table-sorter{
+  color: #fff!important;
+}
+
+/*表格头多选框颜色调整避免和表头颜色冲突*/
+.n-data-table-thead .n-data-table-tr .n-checkbox-box{
+background: #fff;
+  .n-checkbox-icon{
+    .check-icon{
+      fill:#462AA0 ;
+    }
+    svg{
+      fill:#462AA0 ;
+    }
+  }
+  .n-checkbox-box__border{
+    border: #fff!important;
+  }
+}
+/*弹窗内表格背景颜色调整*/
+.n-data-table .n-data-table-th {
+  background-color: #462AA0;
+}
+/*
+naive ui 消息提示框 样式调整
+*/
+.n-message-wrapper{
+  .n-message{
+    &.n-message--info-type{
+      border: 1px solid #C7DFFB;
+      background-color: #EDF5FE;
+    }
+    &.n-message--warning-type{
+      border: 1px solid #FAE0B5;
+      background-color: #FEF7ED;
+    }
+    &.n-message--error-type{
+      border: 1px solid #F3CBD3;
+      background-color:#FBEEF1;
+    }
+    &.n-message--success-type{
+      border: 1px solid #C5E7D5;
+      background-color:#EDF7F2;
+    }
+    &.n-message--loading-type{
+      border: 1px solid #B2A6D6;
+      background-color:#EDF7F2;
+    }
+  }
+}
+/*
+n-image 图片放大查看器工具栏样式调整 样式污染问题
+*/
+.n-base-icon{
+  box-sizing: initial!important;
+}
+/*表格排序列背景颜色问题*/
+.n-data-table .n-data-table-th.n-data-table-th--sortable{
+  background-color: #462AA0;
+}
+.n-data-table .n-data-table-th.n-data-table-th--sortable:hover{
+  background-color: #462AA0;
+}

src/components/talk/message/TextMessage.vue

@@ -71,6 +71,8 @@ textContent = textReplaceEmoji(textContent)
     line-height: 25px;
 
     :deep(.emoji) {
+      width: 22px;
+      height: 22px;
       vertical-align: text-bottom;
       margin: 0 5px;
     }

src/components/user/ContactModal.vue

@@ -15,7 +15,7 @@ interface Item {
   keyword: string
 }
 
-const isShowBox = ref(true)
+const isShowBox = defineModel('show')
 const loading = ref(true)
 const items = ref<Item[]>([])
 const keywords = ref('')

src/main.ts

@@ -1,6 +1,7 @@
 import '@/assets/css/define/theme.less'
 import '@/assets/css/define/global.less'
 import '@/assets/css/dropsize.less'
+import '@/assets/css/naive-ui-adjust.less'
 import 'uno.css'
 import { createApp } from 'vue'
 import router from './router'

src/views/message/inner/IndexSider.vue

@@ -682,7 +682,7 @@ const handleRecordDetailLastIdChange = (last_id, last_group_id, last_member_id)
     </header>
 
     <!-- 置顶栏目 -->
-    <header class="el-header header-top" v-show="loadStatus == 3 && topItems.length > 0">
+    <!-- <header class="el-header header-top" v-show="loadStatus == 3 && topItems.length > 0">
       <n-popover v-for="item in topItems" :key="item.index_name" placement="bottom" trigger="hover">
         <template #trigger>
           <div
@@ -705,7 +705,7 @@ const handleRecordDetailLastIdChange = (last_id, last_group_id, last_member_id)
         </template>
         <span> {{ item.remark || item.name }} </span>
       </n-popover>
-    </header>
+    </header> -->
 
     <!-- 标题栏目 -->
     <header

src/views/message/inner/panel/MultiSelectFooter.vue

@@ -108,7 +108,7 @@ const onContactModal = (data: { id: number; type: number }[]) => {
   </section>
 
   <ContactModal
-    v-if="isShowContactModal"
+  v-model:show="isShowContactModal"
     v-on:close="isShowContactModal = false"
     v-on:on-submit="onContactModal"
     :forward-mode="forwardMode"
@@ -142,10 +142,22 @@ const onContactModal = (data: { id: number; type: number }[]) => {
         height: 72px;
         background-color: var(--im-active-bg-color);
         border-radius: 50%;
+        transition: all 0.3s ease;
+        box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
+
+        img {
+          transition: filter 0.3s ease;
+        }
 
         &:hover {
           background-color: #ff5722;
           color: #fff;
+          transform: translateY(-5px) scale(1.05);
+          box-shadow: 0 8px 15px rgba(0, 0, 0, 0.2);
+          
+          img {
+            filter: brightness(1.2) contrast(0.9);
+          }
         }
       }
 
@@ -154,6 +166,21 @@ const onContactModal = (data: { id: number; type: number }[]) => {
         line-height: 30px;
         font-size: 12px;
         text-align: center;
+        transition: all 0.3s ease;
+      }
+
+    
+    }
+  }
+  
+  .pointer {
+    img {
+      transition: all 0.5s ease;
+      
+      &:hover {
+        filter: brightness(0.8) drop-shadow(0 0 2px rgba(0, 0, 0, 0.2)) drop-shadow(0 0 2px rgba(0, 0, 0, 0.2));
+
+
       }
     }
   }