Commit 577c6bcc by 董文博

Merge branch 'master' into pre

parents 973d467b 62ddb14d
Showing with 5 additions and 2 deletions
......@@ -398,7 +398,10 @@
if (this.chatMembers) {
const t = this.chatMembers.find((i) => i.eid === this.data.eid);
if (t) {
const name = this.getFilterUsername(t.alias_name, t.name);
const name = this.getFilterUsername(
t.alias_name as string,
t.name
);
if (name) {
return name;
}
......
......@@ -957,7 +957,7 @@ export default {
return result;
})
);
state[ChatStore.STATE_ALL_HISTORY_CHAT_MEMBERS] = all;
(<any>state)[ChatStore.STATE_ALL_HISTORY_CHAT_MEMBERS] = all;
const newChatMembers = all.filter((it) => !it.is_exited);
const member = newChatMembers.find(
(it) =>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment