|
@@ -193,7 +193,7 @@ export default {
|
|
if (message.type == 'event'){
|
|
if (message.type == 'event'){
|
|
// if(this.user.id == message.fromUser.id){}
|
|
// if(this.user.id == message.fromUser.id){}
|
|
unread = 0;
|
|
unread = 0;
|
|
- }
|
|
|
|
|
|
+ }
|
|
if (messageList === undefined) {
|
|
if (messageList === undefined) {
|
|
//console.log("qxj appendMessage messageList:"+messageList+",message"+JSON.stringify(message));
|
|
//console.log("qxj appendMessage messageList:"+messageList+",message"+JSON.stringify(message));
|
|
conversation.id=message.toContactId;
|
|
conversation.id=message.toContactId;
|
|
@@ -206,7 +206,7 @@ export default {
|
|
let hasMsg = messageList.some(({id})=>id == message.id);
|
|
let hasMsg = messageList.some(({id})=>id == message.id);
|
|
if (hasMsg) return;
|
|
if (hasMsg) return;
|
|
this._addMessage(message, message.toContactId, 1);
|
|
this._addMessage(message, message.toContactId, 1);
|
|
-
|
|
|
|
|
|
+
|
|
conversation.lastContent=this.lastContentRender(message);
|
|
conversation.lastContent=this.lastContentRender(message);
|
|
conversation.lastSendTime=message.sendTime;
|
|
conversation.lastSendTime=message.sendTime;
|
|
if (message.toContactId == this.currentContactId) {
|
|
if (message.toContactId == this.currentContactId) {
|
|
@@ -234,7 +234,7 @@ export default {
|
|
},
|
|
},
|
|
_handleSend(text) {
|
|
_handleSend(text) {
|
|
const message = this._createMessage({ content: text });
|
|
const message = this._createMessage({ content: text });
|
|
- this.appendMessage(message, true);
|
|
|
|
|
|
+ // this.appendMessage(message, true);
|
|
this._emitSend(message, () => {
|
|
this._emitSend(message, () => {
|
|
this.updateContact({
|
|
this.updateContact({
|
|
id: message.toContactId,
|
|
id: message.toContactId,
|
|
@@ -528,7 +528,7 @@ export default {
|
|
</div>,
|
|
</div>,
|
|
);
|
|
);
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
//聊天消息View
|
|
//聊天消息View
|
|
nodes.push(
|
|
nodes.push(
|
|
<div
|
|
<div
|
|
@@ -692,7 +692,7 @@ export default {
|
|
editorValue,
|
|
editorValue,
|
|
lastContent,
|
|
lastContent,
|
|
});
|
|
});
|
|
-
|
|
|
|
|
|
+
|
|
var tempDraft=this.CacheDraft.get(cid);
|
|
var tempDraft=this.CacheDraft.get(cid);
|
|
//console.log("qxj editorValue:"+editorValue+",tempDraft:"+JSON.stringify(tempDraft)+"lastContent:"+lastContent);
|
|
//console.log("qxj editorValue:"+editorValue+",tempDraft:"+JSON.stringify(tempDraft)+"lastContent:"+lastContent);
|
|
|
|
|
|
@@ -762,13 +762,15 @@ export default {
|
|
if (!allMessages[contactId]) {
|
|
if (!allMessages[contactId]) {
|
|
this.updateCurrentMessages();
|
|
this.updateCurrentMessages();
|
|
this._emitPullMessages(isEnd => {
|
|
this._emitPullMessages(isEnd => {
|
|
|
|
+ setTimeout(() => {
|
|
this.messageViewToBottom();
|
|
this.messageViewToBottom();
|
|
|
|
+ }, 10);
|
|
});
|
|
});
|
|
} else {
|
|
} else {
|
|
- setTimeout(() => {
|
|
|
|
- this.updateCurrentMessages();
|
|
|
|
- this.messageViewToBottom();
|
|
|
|
- }, 0);
|
|
|
|
|
|
+ this.updateCurrentMessages();
|
|
|
|
+ setTimeout(() => {
|
|
|
|
+ this.messageViewToBottom();
|
|
|
|
+ }, 10);
|
|
}
|
|
}
|
|
},
|
|
},
|
|
/**
|
|
/**
|
|
@@ -926,7 +928,6 @@ export default {
|
|
initConversations(data) {
|
|
initConversations(data) {
|
|
this.conversations = data;
|
|
this.conversations = data;
|
|
this.sortConversations();
|
|
this.sortConversations();
|
|
-
|
|
|
|
},
|
|
},
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -1017,7 +1018,7 @@ export default {
|
|
*/
|
|
*/
|
|
updateContact(data) {
|
|
updateContact(data) {
|
|
const conversationId = data.conversationId;
|
|
const conversationId = data.conversationId;
|
|
- const index = this.findConversationIndexById(conversationId);
|
|
|
|
|
|
+ const index = this.findConversationIndexById(conversationId);
|
|
if (index !== -1) {
|
|
if (index !== -1) {
|
|
// if(isString(data.unread)) {
|
|
// if(isString(data.unread)) {
|
|
// if (unread.indexOf("+") === 0 || unread.indexOf("-") === 0) {
|
|
// if (unread.indexOf("+") === 0 || unread.indexOf("-") === 0) {
|
|
@@ -1033,7 +1034,7 @@ export default {
|
|
updateContact1(data) {
|
|
updateContact1(data) {
|
|
const contactId = data.id;
|
|
const contactId = data.id;
|
|
delete data.id;
|
|
delete data.id;
|
|
- const index = this.findContactIndexById(contactId);
|
|
|
|
|
|
+ const index = this.findContactIndexById(contactId);
|
|
if (index !== -1) {
|
|
if (index !== -1) {
|
|
const { unread } = data;
|
|
const { unread } = data;
|
|
if (isString(unread)) {
|
|
if (isString(unread)) {
|