Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger
This commit is contained in:
commit
e7bf489656
|
@ -336,13 +336,13 @@ export class MessageBoxComponent
|
|||
|
||||
this.getSearchMessage(
|
||||
MessageType.All,
|
||||
MessageSearchType.Name,
|
||||
this.fgSearchType.get('searchMessageSearchType').value,
|
||||
search.trim()
|
||||
);
|
||||
}
|
||||
getSearchMessage(
|
||||
messageType: MessageType,
|
||||
searchType: MessageSearchType,
|
||||
searchType: MessageSearchType = MessageSearchType.Name,
|
||||
searchStr: string
|
||||
) {
|
||||
this.isSearch = true;
|
||||
|
|
|
@ -71,6 +71,7 @@
|
|||
padding: 10px;
|
||||
min-height: 250px;
|
||||
border: 1px solid #dddddd;
|
||||
word-break: break-all;
|
||||
//overflow: auto;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user