no message
This commit is contained in:
Vendored
+1
-1
File diff suppressed because one or more lines are too long
Vendored
+1
-1
File diff suppressed because one or more lines are too long
Vendored
-2
File diff suppressed because one or more lines are too long
Vendored
+2
-1
File diff suppressed because one or more lines are too long
Vendored
+1
-1
File diff suppressed because one or more lines are too long
Vendored
+1
File diff suppressed because one or more lines are too long
+1
-1
@@ -1 +1 @@
|
||||
c2cf47af32eff6e3
|
||||
b7b6bde638b0e98e
|
||||
|
||||
@@ -260,7 +260,17 @@ export default {
|
||||
return true;
|
||||
})
|
||||
if (dialogSearch.length > 0) {
|
||||
list.push(...dialogSearch.map(item => Object.assign(item, {is_search: true})))
|
||||
const msgIds = [];
|
||||
list.forEach(item => {
|
||||
if (item.last_msg && !msgIds.includes(item.last_msg.id)) {
|
||||
msgIds.push(item.last_msg.id)
|
||||
}
|
||||
})
|
||||
dialogSearch.forEach(item => {
|
||||
if (!msgIds.includes(item.last_msg.id)) {
|
||||
list.push(Object.assign(item, {is_search: true}))
|
||||
}
|
||||
})
|
||||
}
|
||||
return list.sort((a, b) => {
|
||||
if (a.top_at || b.top_at) {
|
||||
|
||||
Reference in New Issue
Block a user