+
-
+
+
diff --git a/src/views/message/inner/panel/PanelHeader.vue b/src/views/message/inner/panel/PanelHeader.vue
index 53e377d..680d5f1 100644
--- a/src/views/message/inner/panel/PanelHeader.vue
+++ b/src/views/message/inner/panel/PanelHeader.vue
@@ -67,12 +67,12 @@ const onSetMenu = () => {
@click="emit('evnet', 'notice')"
/>
+
群成员
@@ -284,7 +294,30 @@ const showChatSettingOperateModal = (type: string) => {
+
@@ -335,7 +368,7 @@ const showChatSettingOperateModal = (type: string) => {
清空聊天记录
{
>
解散该群
-
+
退出群聊
@@ -404,8 +443,11 @@ const showChatSettingOperateModal = (type: string) => {
height: 100%;
.header {
- width: 100%;
+ width: calc(100% - 40px);
height: 60px;
+ margin: 0 20px;
+ box-sizing: border-box;
+ border-bottom: 2px solid #efeff2;
display: flex;
align-items: center;
@@ -425,7 +467,7 @@ const showChatSettingOperateModal = (type: string) => {
.left-icon,
.right-icon {
- width: 50px;
+ width: 30px;
height: 100%;
flex-shrink: 0;
cursor: pointer;
@@ -437,7 +479,7 @@ const showChatSettingOperateModal = (type: string) => {
}
.main {
- padding: 15px;
+ padding: 15px 20px;
.info-box {
.b-box {
@@ -498,6 +540,9 @@ const showChatSettingOperateModal = (type: string) => {
color: #999999;
}
}
+ .b-box-bottomBorder {
+ border-bottom: 1px solid #f0f0f2;
+ }
}
.member-box {
@@ -572,7 +617,7 @@ const showChatSettingOperateModal = (type: string) => {
.btn {
width: calc(100% - 50px);
background-color: #fff;
- color: #CF3050;
+ color: #cf3050;
}
}
diff --git a/src/components/search/searchByCondition.vue b/src/components/search/searchByCondition.vue
new file mode 100644
index 0000000..0ded9ab
--- /dev/null
+++ b/src/components/search/searchByCondition.vue
@@ -0,0 +1,896 @@
+
+
{
flex-direction: row;
align-items: center;
justify-content: flex-start;
- padding: 11px 0 12px;
- border-bottom: 1px solid #f8f8f8;
+ padding: 11px 10px 12px;
+ cursor: pointer;
+ position: relative;
.search-item-avatar{
position: relative;
@@ -331,7 +339,21 @@ const resultDetail = computed(() => {
}
}
}
+.search-item::after{
+ content: '';
+ display: block;
+ width: 100%;
+ height: 1px;
+ position: absolute;
+ bottom: 0;
+ left: 10px;
+ width: calc(100% - 20px);
+ background-color: #f8f8f8;
+}
.search-item-condition {
border: 0;
}
+.search-item:hover {
+ background-color: #f8f8f8;
+}
diff --git a/src/components/search/searchList.vue b/src/components/search/searchList.vue
index 6604189..7c69137 100644
--- a/src/components/search/searchList.vue
+++ b/src/components/search/searchList.vue
@@ -34,6 +34,11 @@
:searchItem="item"
:searchText="state.searchText"
:searchRecordDetail="props.searchRecordDetail"
+ :isClickStay="
+ props.useClickStay &&
+ typeof state.clickStayItem === 'string' &&
+ state.clickStayItem === `${item.talk_type}_${item.receiver_id}`
+ "
>
@@ -127,16 +132,23 @@
// useZPaging(zPaging)
import searchItem from './searchItem.vue'
-import { ref, reactive, defineEmits, defineProps, onMounted } from 'vue'
+import { ref, reactive, defineEmits, defineProps, onMounted, watch } from 'vue'
-const emits = defineEmits(['toMoreResultPage', 'lastIdChange', 'clickSearchItem'])
+const emits = defineEmits([
+ 'toMoreResultPage',
+ 'lastIdChange',
+ 'clickSearchItem',
+ 'clickStayItemChange',
+ 'doLoadMore'
+])
const state = reactive({
searchText: '', //搜索内容
searchResultList: [], //搜素结果列表
searchResult: null, //搜索结果
pageNum: 1, //当前请求数据页数
- uid: 1496 //当前用户id
+ uid: 12303, //当前用户id
+ clickStayItem: '' //点击停留的item
})
const props = defineProps({
@@ -174,394 +186,203 @@ const props = defineProps({
hideFirstRecord: {
type: Boolean,
default: false
- } //是否隐藏前缀及搜索群/用户主体信息
+ }, //是否隐藏前缀及搜索群/用户主体信息
+ useClickStay: {
+ type: Boolean,
+ default: false
+ } //是否使用点击停留样式
})
onMounted(() => {
if (props.searchText) {
state.searchText = props.searchText
- queryAllSearch(1, 10)
+ queryAllSearch()
}
})
+// 监听每页数量变化
+watch(
+ () => props.searchResultPageSize,
+ (newVal, oldVal) => {
+ queryAllSearch()
+ }
+)
+
+// 监听搜索文本变化
+watch(
+ () => props.searchText,
+ (newVal, oldVal) => {
+ queryAllSearch()
+ state.clickStayItem = ''
+ emits('clickStayItemChange', state.clickStayItem)
+ }
+)
+
//输入搜索文本
const inputSearchText = (e) => {
if (e.trim() != state.searchText.trim()) {
state.pageNum = 1
state.searchResult = null // 清空搜索结果
- emits('lastIdChange', 0, 0, 0)
+ emits('lastIdChange', 0, 0, 0, '', '')
}
state.searchText = e.trim()
if (!e.trim()) {
state.searchResult = null // 清空搜索结果
- emits('lastIdChange', 0, 0, 0)
+ emits('lastIdChange', 0, 0, 0, '', '')
}
// zPaging.value?.reload()
+ queryAllSearch()
}
// ES搜索聊天记录-主页搜索什么都有、指定用户、指定群、群与用户概览
-const queryAllSearch = (pageNum, searchResultPageSize) => {
+const queryAllSearch = (doClearSearchResult) => {
+ if (doClearSearchResult) {
+ state.searchResult = null
+ }
let params = {
key: state.searchText, //关键字
- size: searchResultPageSize
+ size: props.searchResultPageSize
}
if (props.apiParams) {
let apiParams = JSON.parse(decodeURIComponent(props.apiParams))
params = Object.assign({}, params, apiParams)
}
- const data = {
- user_infos: [
- {
- id: 127,
- mobile: '17706200252',
- nickname: '测试-王溢韬',
- avatar:
- 'https://dci-file-new.bj.bcebos.com/fonchain-main/test/runtime/image/avatar/40/b8ed6fea-6662-416d-8bb3-1fd8a8197061.jpg',
- created_at: '2025-03-28 11:33:13',
- erp_user_id: 18282
- },
- {
- id: 103,
- mobile: '13814969538',
- nickname: '王静测试',
- avatar: '',
- created_at: '2025-03-27 14:44:23',
- erp_user_id: 2639
- },
- {
- id: 57,
- mobile: '13862027511',
- nickname: '王西',
- avatar:
- 'https://dci-file-new.bj.bcebos.com/fonchain-main/test/runtime/image/avatar/40/b8ed6fea-6662-416d-8bb3-1fd8a8197061.jpg',
- created_at: '2025-03-27 14:44:23',
- erp_user_id: 18229
- }
- ],
- user_count: 9,
- group_infos: null,
- group_member_infos: [
- {
- id: 79,
- group_id: 1,
- group_name: '泰丰国际',
- group_type: 4,
- group_avatar: '',
- group_num: 103,
- user_id: 103,
- user_name: '王静',
- user_card: '',
- created_at: '2025-03-27 14:44:24'
- },
- {
- id: 55,
- group_id: 1,
- group_name: '泰丰国际',
- group_type: 4,
- group_avatar: '',
- group_num: 103,
- user_id: 57,
- user_name: '王西',
- user_card: '',
- created_at: '2025-03-27 14:44:24'
- },
- {
- id: 35,
- group_id: 1,
- group_name: '泰丰国际',
- group_type: 4,
- group_avatar: '',
- group_num: 103,
- user_id: 37,
- user_name: '王雯婷',
- user_card: '',
- created_at: '2025-03-27 14:44:24'
- }
- ],
- group_count: 9,
- general_infos: [
- {
- receiver_id: 40,
- receiver_name: '孙志远',
- receiver_avatar:
- 'https://dci-file-new.bj.bcebos.com/fonchain-main/test/runtime/image/avatar/40/b8ed6fea-6662-416d-8bb3-1fd8a8197061.jpg',
- group_num: 0,
- talk_type: 1,
- count: 3,
- group_type: 0
- },
- {
- receiver_id: 2,
- receiver_name: '吹牛个人群',
- receiver_avatar: '',
- group_num: 4,
- talk_type: 2,
- count: 2,
- group_type: 3
- },
- {
- receiver_id: 3,
- receiver_name: '丰链30自己人',
- receiver_avatar:
- 'https://e-cdn.fontree.cn/fonchain-main/prod/image/default/fonchain-chat/3d273326-d2a5-4ad4-a974-32d020c6b3f9.jpg?width=1080&height=2412',
- group_num: 8,
- talk_type: 2,
- count: 2,
- group_type: 3
- }
- ],
- record_count: 3
- }
- if ((data.user_infos || []).length > 0) {
- ;(data.user_infos || []).forEach((item) => {
- item.group_type = 0
- })
- }
- if ((data.group_infos || []).length > 0) {
- ;(data.group_infos || []).forEach((item) => {
- item.group_type = item.type
- item.groupTempType = 'group_infos'
- })
- }
- if ((data.group_member_infos || []).length > 0) {
- ;(data.group_member_infos || []).forEach((item) => {
- item.groupTempType = 'group_member_infos'
- })
- }
- if ((data.talk_record_infos || []).length > 0) {
- let receiverInfo = JSON.parse(JSON.stringify(data.talk_record_infos[0]))
- if (receiverInfo.talk_type === 1) {
- //单聊才需此判断
- if (receiverInfo.user_id === state.uid) {
- //发送人是自己，接收人不需要变
- }
- if (receiverInfo.receiver_id === state.uid) {
- //接收人是自己，这里需要变成对方
- let temp_id = receiverInfo.receiver_id
- let temp_name = receiverInfo.receiver_name
- let temp_avatar = receiverInfo.receiver_avatar
- receiverInfo.receiver_id = receiverInfo.user_id
- receiverInfo.receiver_name = receiverInfo.user_name
- receiverInfo.receiver_avatar = receiverInfo.user_avatar
- receiverInfo.user_id = temp_id
- receiverInfo.user_name = temp_name
- receiverInfo.user_avatar = temp_avatar
- }
- }
- state.first_talk_record_infos = Object.assign({}, state.first_talk_record_infos, receiverInfo)
- ;(data.talk_record_infos || []).forEach((item) => {
- item.group_type = 0
- })
- }
- let tempGeneral_infos = Array.isArray(data.general_infos)
- ? [...data.general_infos]
- : data.general_infos
- delete data.general_infos
- data.combinedGroup = (data.group_infos || []).concat(data.group_member_infos || [])
- data.general_infos = tempGeneral_infos
+ const resp = props.apiRequest(params)
+ resp.then(({ code, data }) => {
+ console.log(data)
+ if (code == 200) {
+ if ((data.user_infos || []).length > 0) {
+ ;(data.user_infos || []).forEach((item) => {
+ item.group_type = 0
+ })
+ }
+ if ((data.group_infos || []).length > 0) {
+ ;(data.group_infos || []).forEach((item) => {
+ item.group_type = item.type
+ item.groupTempType = 'group_infos'
+ })
+ }
+ if ((data.group_member_infos || []).length > 0) {
+ ;(data.group_member_infos || []).forEach((item) => {
+ item.groupTempType = 'group_member_infos'
+ })
+ }
+ if ((data.talk_record_infos || []).length > 0) {
+ let receiverInfo = JSON.parse(JSON.stringify(data.talk_record_infos[0]))
+ if (receiverInfo.talk_type === 1) {
+ //单聊才需此判断
+ if (receiverInfo.user_id === state.uid) {
+ //发送人是自己，接收人不需要变
+ }
+ if (receiverInfo.receiver_id === state.uid) {
+ //接收人是自己，这里需要变成对方
+ let temp_id = receiverInfo.receiver_id
+ let temp_name = receiverInfo.receiver_name
+ let temp_avatar = receiverInfo.receiver_avatar
+ receiverInfo.receiver_id = receiverInfo.user_id
+ receiverInfo.receiver_name = receiverInfo.user_name
+ receiverInfo.receiver_avatar = receiverInfo.user_avatar
+ receiverInfo.user_id = temp_id
+ receiverInfo.user_name = temp_name
+ receiverInfo.user_avatar = temp_avatar
+ }
+ }
+ state.first_talk_record_infos = Object.assign(
+ {},
+ state.first_talk_record_infos,
+ receiverInfo
+ )
+ ;(data.talk_record_infos || []).forEach((item) => {
+ item.group_type = 0
+ })
+ }
- // 检查数据是否为空
- let isEmpty = true
- let dataKeys = Object.keys(data)
- let paginationKey = ''
- dataKeys.forEach((item) => {
- if (Array.isArray(data[item]) && data[item].length > 0) {
- paginationKey = item
- isEmpty = false
+ let tempGeneral_infos = Array.isArray(data.general_infos)
+ ? [...data.general_infos]
+ : data.general_infos
+ delete data.general_infos
+ data.combinedGroup = (data.group_infos || []).concat(data.group_member_infos || [])
+ data.general_infos = tempGeneral_infos
+
+ // 检查数据是否为空
+ let isEmpty = true
+ let dataKeys = Object.keys(data)
+ let paginationKey = ''
+ dataKeys.forEach((item) => {
+ if (Array.isArray(data[item]) && data[item].length > 0) {
+ paginationKey = item
+ isEmpty = false
+ }
+ })
+
+ if (isEmpty) {
+ if (state.pageNum === 1) {
+ // 第一页请求且为空，清空结果
+ state.searchResult = null
+ // zPaging.value?.complete([])
+ } else {
+ // 加载更多且为空，保持原列表不变
+ // zPaging.value?.complete(state.searchResult ? [state.searchResult] : [])
+ }
+ } else {
+ if (props.isPagination) {
+ if (state.pageNum === 1) {
+ // 第一页请求，直接设置新数据
+ state.searchResult = data
+ } else {
+ // 加载更多，合并数据
+ data[paginationKey] = (state.searchResult?.[paginationKey] || []).concat(
+ data[paginationKey]
+ )
+ state.searchResult = data
+ }
+
+ emits(
+ 'lastIdChange',
+ data.last_id,
+ data.last_group_id,
+ data.last_member_id,
+ data.last_receiver_user_name,
+ data.last_receiver_group_name
+ )
+ let total = data.count
+ if (props.searchRecordDetail) {
+ if (state?.first_talk_record_infos?.talk_type === 1) {
+ total = data.user_record_count
+ } else if (state?.first_talk_record_infos?.talk_type === 2) {
+ total = data.group_record_count
+ }
+ }
+ // zPaging.value?.completeByTotal([data], total)
+ } else {
+ state.searchResult = data
+ // zPaging.value?.complete([data])
+ }
+ }
+ state.pageNum = state.pageNum + 1
+ } else {
+ if (state.pageNum === 1) {
+ // 第一页请求失败，清空结果
+ state.searchResult = null
+ // zPaging.value?.complete([])
+ } else {
+ // 加载更多失败，保持原列表不变
+ // zPaging.value?.complete(state.searchResult ? [state.searchResult] : [])
+ }
}
})
- if (isEmpty) {
- if (pageNum === 1) {
- // 第一页请求且为空，清空结果
+ resp.catch(() => {
+ if (state.pageNum === 1) {
+ // 第一页请求异常，清空结果
state.searchResult = null
// zPaging.value?.complete([])
} else {
- // 加载更多且为空，保持原列表不变
+ // 加载更多异常，保持原列表不变
// zPaging.value?.complete(state.searchResult ? [state.searchResult] : [])
}
- } else {
- if (props.isPagination) {
- if (pageNum === 1) {
- // 第一页请求，直接设置新数据
- state.searchResult = data
- } else {
- // 加载更多，合并数据
- if (
- paginationKey &&
- Array.isArray((state?.searchResult && state?.searchResult[paginationKey]) || [])
- ) {
- data[paginationKey] = state.searchResult[paginationKey].concat(data[paginationKey])
- }
- state.searchResult = data
- }
-
- emits(
- 'lastIdChange',
- data.last_id,
- data.last_group_id,
- data.last_member_id,
- data.last_receiver_user_name,
- data.last_receiver_group_name
- )
- let total = data.count
- if (props.searchRecordDetail) {
- if (state?.first_talk_record_infos?.talk_type === 1) {
- total = data.user_record_count
- } else if (state?.first_talk_record_infos?.talk_type === 2) {
- total = data.group_record_count
- }
- }
- // zPaging.value?.completeByTotal([data], total)
- } else {
- state.searchResult = data
- // zPaging.value?.complete([data])
- }
- }
- // const resp = props.apiRequest(params)
- // resp.then(({ code, data }) => {
- // console.log(data)
- // if (code == 200) {
- // if ((data.user_infos || []).length > 0) {
- // ;(data.user_infos || []).forEach((item) => {
- // item.group_type = 0
- // })
- // }
- // if ((data.group_infos || []).length > 0) {
- // ;(data.group_infos || []).forEach((item) => {
- // item.group_type = item.type
- // item.groupTempType = 'group_infos'
- // })
- // }
- // if ((data.group_member_infos || []).length > 0) {
- // ;(data.group_member_infos || []).forEach((item) => {
- // item.groupTempType = 'group_member_infos'
- // })
- // }
- // if ((data.talk_record_infos || []).length > 0) {
- // let receiverInfo = JSON.parse(JSON.stringify(data.talk_record_infos[0]))
- // if (receiverInfo.talk_type === 1) {
- // //单聊才需此判断
- // if (receiverInfo.user_id === state.uid) {
- // //发送人是自己，接收人不需要变
- // }
- // if (receiverInfo.receiver_id === state.uid) {
- // //接收人是自己，这里需要变成对方
- // let temp_id = receiverInfo.receiver_id
- // let temp_name = receiverInfo.receiver_name
- // let temp_avatar = receiverInfo.receiver_avatar
- // receiverInfo.receiver_id = receiverInfo.user_id
- // receiverInfo.receiver_name = receiverInfo.user_name
- // receiverInfo.receiver_avatar = receiverInfo.user_avatar
- // receiverInfo.user_id = temp_id
- // receiverInfo.user_name = temp_name
- // receiverInfo.user_avatar = temp_avatar
- // }
- // }
- // state.first_talk_record_infos = Object.assign(
- // {},
- // state.first_talk_record_infos,
- // receiverInfo,
- // )
- // ;(data.talk_record_infos || []).forEach((item) => {
- // item.group_type = 0
- // })
- // }
-
- // let tempGeneral_infos = Array.isArray(data.general_infos)
- // ? [...data.general_infos]
- // : data.general_infos
- // delete data.general_infos
- // data.combinedGroup = (data.group_infos || []).concat(
- // data.group_member_infos || [],
- // )
- // data.general_infos = tempGeneral_infos
-
- // // 检查数据是否为空
- // let isEmpty = true
- // let dataKeys = Object.keys(data)
- // let paginationKey = ''
- // dataKeys.forEach((item) => {
- // if (Array.isArray(data[item]) && data[item].length > 0) {
- // paginationKey = item
- // isEmpty = false
- // }
- // })
-
- // if (isEmpty) {
- // if (pageNum === 1) {
- // // 第一页请求且为空，清空结果
- // state.searchResult = null
- // zPaging.value?.complete([])
- // } else {
- // // 加载更多且为空，保持原列表不变
- // zPaging.value?.complete(state.searchResult ? [state.searchResult] : [])
- // }
- // } else {
- // if (props.isPagination) {
- // if (pageNum === 1) {
- // // 第一页请求，直接设置新数据
- // state.searchResult = data
- // } else {
- // // 加载更多，合并数据
- // if (
- // paginationKey &&
- // Array.isArray(
- // (state?.searchResult && state?.searchResult[paginationKey]) || [],
- // )
- // ) {
- // data[paginationKey] = state.searchResult[paginationKey].concat(
- // data[paginationKey],
- // )
- // }
- // state.searchResult = data
- // }
-
- // emits(
- // 'lastIdChange',
- // data.last_id,
- // data.last_group_id,
- // data.last_member_id,
- // data.last_receiver_user_name,
- // data.last_receiver_group_name,
- // )
- // let total = data.count
- // if (props.searchRecordDetail) {
- // if (state?.first_talk_record_infos?.talk_type === 1) {
- // total = data.user_record_count
- // } else if (state?.first_talk_record_infos?.talk_type === 2) {
- // total = data.group_record_count
- // }
- // }
- // zPaging.value?.completeByTotal([data], total)
- // } else {
- // state.searchResult = data
- // zPaging.value?.complete([data])
- // }
- // }
- // } else {
- // if (pageNum === 1) {
- // // 第一页请求失败，清空结果
- // state.searchResult = null
- // zPaging.value?.complete([])
- // } else {
- // // 加载更多失败，保持原列表不变
- // zPaging.value?.complete(state.searchResult ? [state.searchResult] : [])
- // }
- // }
- // })
-
- // resp.catch(() => {
- // if (pageNum === 1) {
- // // 第一页请求异常，清空结果
- // state.searchResult = null
- // zPaging.value?.complete([])
- // } else {
- // // 加载更多异常，保持原列表不变
- // zPaging.value?.complete(state.searchResult ? [state.searchResult] : [])
- // }
- // })
+ })
}
//点击取消搜索
@@ -648,6 +469,12 @@ const toMoreResultPage = (searchResultKey) => {
//点击了搜索结果项
const clickSearchItem = (searchResultKey, searchItem) => {
console.log(searchResultKey, searchItem)
+ if (props.useClickStay) {
+ state.clickStayItem = searchItem.talk_type + '_' + searchItem.receiver_id
+ } else {
+ state.clickStayItem = ''
+ }
+ emits('clickStayItemChange', state.clickStayItem)
let talk_type = searchItem.talk_type
let receiver_id = searchItem.receiver_id
if (searchResultKey === 'user_infos') {
@@ -684,6 +511,16 @@ const clickSearchItem = (searchResultKey, searchItem) => {
encodeURIComponent(JSON.stringify(searchItem))
)
}
+
+//加载更多数据
+const doLoadMore = (doClearSearchResult) => {
+ queryAllSearch(doClearSearchResult)
+}
+
+// 暴露doLoadMore方法给父组件
+defineExpose({
+ doLoadMore
+})
diff --git a/src/views/message/inner/IndexSider.vue b/src/views/message/inner/IndexSider.vue
index fc0f47b..743087f 100644
--- a/src/views/message/inner/IndexSider.vue
+++ b/src/views/message/inner/IndexSider.vue
@@ -7,7 +7,8 @@ import {
reactive,
onBeforeMount,
getCurrentInstance,
- h
+ h,
+ nextTick
} from 'vue'
import { onBeforeRouteUpdate } from 'vue-router'
import { useDialogueStore, useTalkStore } from '@/store'
@@ -36,6 +37,11 @@ import xNDataTable from '@/components/x-naive-ui/x-n-data-table/index.vue'
import flTree from '@/components/flnlayout/tree/flnindex.vue'
import { processError, processSuccess } from '@/utils/helper/message.js'
import chatAppSearchList from '@/components/search/searchList.vue'
+import { ServeSeachQueryAll, ServeQueryTalkRecord, ServeUserGroupChatList } from '@/api/search'
+import { getUserInfoByERPUserId } from '@/api/user'
+
+import { useRouter } from 'vue-router'
+const router = useRouter()
const currentInstance = getCurrentInstance()
const $request = currentInstance?.appContext.config.globalProperties?.$request
@@ -79,24 +85,28 @@ const renderChatAppSearch = () => {
console.log(searchText, searchResultKey, talk_type, receiver_id)
const result = JSON.parse(decodeURIComponent(res))
console.log(result)
+ },
+ onToMoreResultPage: (searchResultKey, searchText) => {
+ if (searchResultKey === 'general_infos') {
+ state.ServeQueryTalkRecordParams = encodeURIComponent(
+ JSON.stringify({
+ talk_type: 0, //1私聊2群聊
+ receiver_id: 0, //查详情的时候需传入
+ last_group_id: 0, //最后一条群id
+ last_member_id: 0, //最后一条用户id
+ last_receiver_user_name: '', //最后一条用户名
+ last_receiver_group_name: '' //最后一条群名
+ })
+ )
+ state.isShowSearchRecordModal = true
+ }
+ console.log(searchResultKey, searchText)
}
},
{}
)
}
-//ES搜索聊天记录-主页搜索什么都有、指定用户、指定群、群与用户概览
-const ServeSeachQueryAll = () => {
- let url = '/api/v1/elasticsearch/query-all'
- let params = {}
- let config = {
- baseURL: import.meta.env.VITE_BASE_API
- }
- return $request.HTTP.components.postDataByParams(url, params, config).then((res) => {
- console.log(res)
- })
-}
-
const state = reactive({
isShowAddressBookModal: false, // 是否显示通讯录模态框
customModalStyle: {
@@ -174,7 +184,7 @@ const state = reactive({
field: 'groupName',
width: 200,
render(row, index) {
- return row.groupName
+ return row.group_name
}
},
{
@@ -183,7 +193,16 @@ const state = reactive({
width: 400,
ellipsis: true,
render(row, index) {
- return row.groupType
+ let groupType = row.group_type
+ if (groupType == 1) {
+ return '普通群'
+ } else if (groupType == 2) {
+ return '部门群'
+ } else if (groupType == 3) {
+ return '项目群'
+ } else if (groupType == 4) {
+ return '公司群'
+ }
}
},
{
@@ -225,7 +244,17 @@ const state = reactive({
type: 'render',
render: renderChatAppSearch
}
- ] // 聊天搜索选项
+ ], // 聊天搜索选项
+ isShowSearchRecordModal: false, // 是否显示搜索聊天记录模态框
+ customSearchRecordModalStyle: {
+ width: '997px',
+ height: '740px',
+ backgroundColor: '#F9F9FD'
+ }, //自定义模态框样式
+ searchRecordText: '', // 搜索聊天记录文本
+ ServeQueryTalkRecordParams: '', // 搜索聊天记录参数
+ ServeQueryTalkRecordDetailParams: '', // 搜索聊天记录详情参数
+ isShowSearchRecordDetailInfo: false // 是否显示搜索聊天记录详情
})
const items = computed((): ISession[] => {
@@ -260,10 +289,39 @@ watch(
state.addressBookTableWidth = 800
state.clickKey = 3
state.treeRefreshCount++
+ state.addressBookPage = 1
}
getDepPoisUser()
}
)
+watch(
+ () => state.groupChatListSearchGroupName,
+ (newValue, oldValue) => {
+ if (newValue) {
+ state.groupChatListPage = 1
+ } else {
+ state.groupChatListPage = 1
+ }
+ getUserGroupChatList()
+ }
+)
+
+// watch(
+// () => state.searchRecordText,
+// (newValue, oldValue) => {
+// console.log(newValue, 'newValue')
+// state.ServeQueryTalkRecordParams = encodeURIComponent(
+// JSON.stringify({
+// talk_type: 0, //1私聊2群聊
+// receiver_id: 0, //查详情的时候需传入
+// last_group_id: 0, //最后一条群id
+// last_member_id: 0, //最后一条用户id
+// last_receiver_user_name: '', //最后一条用户名
+// last_receiver_group_name: '' //最后一条群名
+// })
+// )
+// }
+// )
// 列表加载状态
const loadStatus = computed(() => talkStore.loadStatus)
@@ -323,6 +381,7 @@ onBeforeRouteUpdate(onInitialize)
onBeforeMount(() => {
getTreeData()
+ getUserGroupChatList()
})
onMounted(() => {
@@ -397,8 +456,40 @@ const getDepPoisUser = () => {
})
}
//点击进入对应的聊天
-const handleEnterChat = (row) => {
+const handleEnterChat = async (row) => {
console.log(row)
+ if (state.addressBookCurrentTab === 'employeeAddressBook') {
+ //员工通讯录，聊天类型一定为单聊
+ await getUserInfoByERPUserId({ erp_user_id: row.ID }).then((res) => {
+ // console.log(res)
+ if (res.code === 200) {
+ let sysUserInfo = res.data
+ talkStore.toTalk(1, sysUserInfo.sys_id, router)
+ }
+ })
+ } else if (state.addressBookCurrentTab === 'groupChatList') {
+ //群聊列表，聊天类型一定为群聊
+ talkStore.toTalk(2, row.id, router)
+ }
+ state.isShowAddressBookModal = false
+ resetAddressBookModal()
+}
+//恢复默认通讯录模态框
+const resetAddressBookModal = () => {
+ nextTick(() => {
+ state.addressBookCurrentTab = 'employeeAddressBook'
+ state.addressBookSearchNickName = ''
+ state.groupChatListSearchGroupName = ''
+ state.addressBookTableWidth = 800
+ state.clickKey = 3
+ state.treeRefreshCount++
+ state.addressBookPage = 1
+ state.addressBookPageSize = 10
+ state.groupChatListPage = 1
+ state.groupChatListPageSize = 10
+ getDepPoisUser()
+ getUserGroupChatList()
+ })
}
//处理页数变化
const handleAddressBookPagination = (page) => {
@@ -427,16 +518,121 @@ const handleAddressBookTabChange = (value) => {
//处理群聊列表搜索
const changeGroupChatListSearch = (value) => {
console.log(value, 'value')
+ if (!value.groupName?.trim()) {
+ state.groupChatListSearchGroupName = ''
+ } else {
+ state.groupChatListSearchGroupName = value.groupName
+ }
}
+//获取用户所在群聊列表
+const getUserGroupChatList = () => {
+ let params = {
+ page: state.groupChatListPage,
+ page_size: state.groupChatListPageSize,
+ group_name: state.groupChatListSearchGroupName
+ }
+ ServeUserGroupChatList(params).then((res) => {
+ // console.log(res)
+ if (res.code === 200) {
+ state.groupChatListData = res?.data?.items || []
+ state.groupChatListTotal = res?.data?.total || 0
+ }
+ })
+}
+
//处理群聊列表页数变化
const handleGroupChatListPagination = (value) => {
console.log(value, 'value')
state.groupChatListPage = value
+ getUserGroupChatList()
}
//处理群聊列表每页条数变化
const handleGroupChatListPaginationSize = (value) => {
console.log(value, 'value')
state.groupChatListPageSize = value
+ state.groupChatListPage = 1
+ getUserGroupChatList()
+}
+//处理搜索聊天记录点击
+const handleClickSearchItem = (searchText, searchResultKey, talk_type, receiver_id, res) => {
+ console.log(searchText, searchResultKey, talk_type, receiver_id)
+ const result = JSON.parse(decodeURIComponent(res))
+ console.log(result)
+ if (searchResultKey === 'general_infos') {
+ state.ServeQueryTalkRecordDetailParams = encodeURIComponent(
+ JSON.stringify({
+ last_group_id: 0, //最后一条群id
+ last_member_id: 0, //最后一条用户id
+ receiver_id: receiver_id, //查详情的时候需传入
+ talk_type: talk_type //1私聊2群聊
+ })
+ )
+ nextTick(() => {
+ searchDetailListRef.value?.doLoadMore(true)
+ })
+ }
+}
+//处理点击停留item变化
+const handleClickStayItemChange = (item) => {
+ if (item) {
+ state.isShowSearchRecordDetailInfo = true
+ } else {
+ state.isShowSearchRecordDetailInfo = false
+ }
+}
+
+// 定义搜索列表组件的ref
+const searchListRef = ref()
+
+// 定义搜索详情列表组件的ref
+const searchDetailListRef = ref()
+
+//搜索聊天记录列表加载更多
+const loadMoreRecordList = () => {
+ searchListRef.value?.doLoadMore()
+}
+
+// 搜索聊天记录详情列表加载更多
+const loadMoreRecordDetail = () => {
+ searchDetailListRef.value?.doLoadMore()
+}
+
+const handleMoreRecordLastIdChange = (
+ last_id,
+ last_group_id,
+ last_member_id,
+ last_receiver_user_name,
+ last_receiver_group_name
+) => {
+ let idChanges = {
+ last_id,
+ last_group_id,
+ last_member_id,
+ last_receiver_user_name,
+ last_receiver_group_name
+ }
+ state.ServeQueryTalkRecordParams = encodeURIComponent(
+ JSON.stringify(
+ Object.assign({}, JSON.parse(decodeURIComponent(state.ServeQueryTalkRecordParams)), idChanges)
+ )
+ )
+}
+
+const handleRecordDetailLastIdChange = (last_id, last_group_id, last_member_id) => {
+ let idChanges = {
+ last_id,
+ last_group_id,
+ last_member_id
+ }
+ state.ServeQueryTalkRecordDetailParams = encodeURIComponent(
+ JSON.stringify(
+ Object.assign(
+ {},
+ JSON.parse(decodeURIComponent(state.ServeQueryTalkRecordDetailParams)),
+ idChanges
+ )
+ )
+ )
}
@@ -645,6 +841,70 @@ const handleGroupChatListPaginationSize = (value) => {
+
+
+
+
+
+
+
+
+ 
+
+ 查找聊天记录
+
+
+
+
+
+
+ 置顶会话
+
+
+
+
+ 消息免打扰
+
+
+
+
+
diff --git a/src/components/search/searchItem.vue b/src/components/search/searchItem.vue
index 54fd755..4aac4e4 100644
--- a/src/components/search/searchItem.vue
+++ b/src/components/search/searchItem.vue
@@ -3,7 +3,10 @@
class="search-item"
:class="props?.conditionType ? 'search-item-condition' : ''"
v-if="resultName"
- :style="props.searchResultKey === 'talk_record_infos_receiver' ? 'margin: 12px 0 0' : ''"
+ :style="{
+ 'margin': props.searchResultKey === 'talk_record_infos_receiver' ? '12px 0 0' : '',
+ 'background-color': props.isClickStay ? '#EEE9F8' : ''
+ }"
>
+
+
+
+
+
+
+
+
+
+ {{ state.selectedMonth }}
+
+ 
+
+
+
+
+
+
+
+
+ 取消
+
+
+
+
+
+
+
+
+
+
+ {{ conditionItem.dateMonth }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+ 暂无搜索内容
+
+
+ 暂无搜索内容
+
+