From daab52c973377c01be695a55cc0ccb12f4ad3bae Mon Sep 17 00:00:00 2001 From: mattuy Date: Fri, 26 Nov 2021 01:20:14 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=81=94=E7=B3=BB=E4=BA=BA=E6=90=9C?= =?UTF-8?q?=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/FunctionBarAndContactList/ContactList.tsx | 5 ++--- .../web/src/modules/FunctionBarAndContactList/SearchBar.tsx | 2 -- packages/web/src/state/reducer.ts | 2 ++ 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/web/src/modules/FunctionBarAndContactList/ContactList.tsx b/packages/web/src/modules/FunctionBarAndContactList/ContactList.tsx index 4473e87..7a1d7cf 100644 --- a/packages/web/src/modules/FunctionBarAndContactList/ContactList.tsx +++ b/packages/web/src/modules/FunctionBarAndContactList/ContactList.tsx @@ -13,14 +13,13 @@ function ContactList({ keyword = '' }) { keyword = keyword.toLowerCase(); contacts = [ ...contacts.filter((c) => c.displayName?.toLowerCase().includes(keyword)), + ...contacts.filter((c) => c.nameInitial?.toLowerCase().includes(keyword)), ...contacts.filter((c) => c.nameQuanPin?.toLowerCase().includes(keyword)), - ...contacts.filter((c) => c.nickname?.toLowerCase().includes(keyword)), + ...contacts.filter((c) => c.nickUameQuanPin?.toLowerCase().includes(keyword)), ...contacts.filter((c) => c.nickname?.toLowerCase().includes(keyword)), ]; contacts = uniq(contacts); } - console.log(contacts); - return (
{contacts.map((contact) => ( diff --git a/packages/web/src/modules/FunctionBarAndContactList/SearchBar.tsx b/packages/web/src/modules/FunctionBarAndContactList/SearchBar.tsx index 9b8a74d..7dcc1a7 100644 --- a/packages/web/src/modules/FunctionBarAndContactList/SearchBar.tsx +++ b/packages/web/src/modules/FunctionBarAndContactList/SearchBar.tsx @@ -14,8 +14,6 @@ function FunctionBar({ onSearch }) { ); const handleInputChange = useCallback( (kw) => { - console.log('aaaaa',kw); - setKeyword(kw); triggerSearch(kw); }, diff --git a/packages/web/src/state/reducer.ts b/packages/web/src/state/reducer.ts index 975abac..6b0a777 100644 --- a/packages/web/src/state/reducer.ts +++ b/packages/web/src/state/reducer.ts @@ -38,6 +38,8 @@ export interface User { signature?: string; nameInitial?: string; nameQuanPin?: string; + nickUameInitial?: string; + nickUameQuanPin?: string; avatar: string; lastReadMessage?: Message; }