- {newContractList && newContractList.length > 0 ? (
+ {searchKeyword.trim() ? (
+ // 搜索模式：直接显示搜索结果列表
+ <>
+
搜索结果
+
+ {searchResults.length === 0 && (
+
未找到匹配的联系人
+ )}
+
+ ) : newContractList && newContractList.length > 0 ? (
+ // 正常模式：显示分组
= ({
items={getCollapseItems()}
/>
) : (
+ // 备用模式：显示传入的联系人列表
<>
- 全部好友
+ 全部联系人
diff --git a/Cunkebao/src/store/module/ckchat/ckchat.ts b/Cunkebao/src/store/module/ckchat/ckchat.ts
index db1bf9e6..bc490b04 100644
--- a/Cunkebao/src/store/module/ckchat/ckchat.ts
+++ b/Cunkebao/src/store/module/ckchat/ckchat.ts
@@ -131,6 +131,71 @@ export const useCkChatStore = createPersistStore(
return cachedResult;
};
})(),
+ // 搜索好友和群组的新方法 - 从本地数据库查询并返回扁平化的搜索结果
+ searchContactsAndGroups: (() => {
+ let cachedResult: (ContractData | weChatGroup)[] = [];
+ let lastKfSelected: number | null = null;
+ let lastSearchKeyword: string = "";
+
+ return async () => {
+ const state = useCkChatStore.getState();
+
+ // 检查是否需要重新计算缓存
+ const shouldRecalculate =
+ lastKfSelected !== state.kfSelected ||
+ lastSearchKeyword !== state.searchKeyword;
+
+ if (shouldRecalculate) {
+ if (state.searchKeyword.trim()) {
+ const keyword = state.searchKeyword.toLowerCase();
+
+ // 从本地数据库查询联系人数据
+ let allContacts: ContractData[] = await contractService.findAll();
+
+ // 根据选中的客服筛选联系人
+ if (state.kfSelected !== 0) {
+ allContacts = allContacts.filter(
+ item => item.wechatAccountId === state.kfSelected,
+ );
+ }
+
+ // 从本地数据库查询群组数据
+ let allGroups: weChatGroup[] = await weChatGroupService.findAll();
+
+ // 根据选中的客服筛选群组
+ if (state.kfSelected !== 0) {
+ allGroups = allGroups.filter(
+ item => item.wechatAccountId === state.kfSelected,
+ );
+ }
+
+ // 搜索匹配的联系人
+ const matchedContacts = allContacts.filter(item => {
+ const nickname = (item.nickname || "").toLowerCase();
+ const conRemark = (item.conRemark || "").toLowerCase();
+ return nickname.includes(keyword) || conRemark.includes(keyword);
+ });
+
+ // 搜索匹配的群组
+ const matchedGroups = allGroups.filter(item => {
+ const nickname = (item.nickname || "").toLowerCase();
+ const conRemark = (item.conRemark || "").toLowerCase();
+ return nickname.includes(keyword) || conRemark.includes(keyword);
+ });
+
+ // 合并搜索结果
+ cachedResult = [...matchedContacts, ...matchedGroups];
+ } else {
+ cachedResult = [];
+ }
+
+ lastKfSelected = state.kfSelected;
+ lastSearchKeyword = state.searchKeyword;
+ }
+
+ return cachedResult;
+ };
+ })(),
// 异步设置联系人分组列表
asyncNewContractList: async (data: any[]) => {
set({ newContractList: data });
@@ -472,4 +537,6 @@ export const setSearchKeyword = (keyword: string) =>
useCkChatStore.getState().setSearchKeyword(keyword);
export const clearSearchKeyword = () =>
useCkChatStore.getState().clearSearchKeyword();
+export const searchContactsAndGroups = () =>
+ useCkChatStore.getState().searchContactsAndGroups();
useCkChatStore.getState().getKfSelectedUser();