diff --git a/resources/assets/js/pages/manage/components/ChatInput/index.vue b/resources/assets/js/pages/manage/components/ChatInput/index.vue
index 2ff4d2e44..dcc51a5d5 100755
--- a/resources/assets/js/pages/manage/components/ChatInput/index.vue
+++ b/resources/assets/js/pages/manage/components/ChatInput/index.vue
@@ -1305,7 +1305,7 @@ export default {
onClickEditor() {
this.clearSearchKey()
this.updateEmojiQuick(this.value)
- this.focus()
+ !this.isFocus && this.focus()
inputLoadAdd(this._uid)
},
diff --git a/resources/assets/js/pages/manage/messenger.vue b/resources/assets/js/pages/manage/messenger.vue
index 692ed7720..4e7e7426e 100644
--- a/resources/assets/js/pages/manage/messenger.vue
+++ b/resources/assets/js/pages/manage/messenger.vue
@@ -262,13 +262,16 @@
-
-
-
-
{{$L('选择一个会话开始聊天')}}
+
+
+
+
+
+
{{$L('选择一个会话开始聊天')}}
+
+
-
-
+
diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js
index 0c368291f..ad1b6528b 100644
--- a/resources/assets/js/store/actions.js
+++ b/resources/assets/js/store/actions.js
@@ -4214,14 +4214,14 @@ export default {
break;
case 'add':
case 'chat':
- const isChat = mode === "chat" || $A.isSubElectron;
+ const isAdd = mode === "add";
if (!state.dialogMsgs.find(({id}) => id == data.id)) {
// 新增任务消息数量
dispatch("increaseTaskMsgNum", {id: data.dialog_id});
// 新增回复数量
dispatch("increaseMsgReplyNum", {id: data.reply_id});
//
- if (!isChat) {
+ if (isAdd) {
if (data.userid !== state.userId) {
// 更新对话新增未读数
const dialog = state.cacheDialogs.find(({id}) => id == dialog_id);
@@ -4249,7 +4249,7 @@ export default {
// 更新消息列表
dispatch("saveDialogMsg", data)
// 更新最后消息
- !isChat && dispatch("updateDialogLastMsg", data);
+ isAdd && dispatch("updateDialogLastMsg", data);
return;
}
setTimeout(() => saveMsg(data, count + 1), 50);
diff --git a/resources/assets/sass/pages/page-messenger.scss b/resources/assets/sass/pages/page-messenger.scss
index 3fbea4990..051ac856d 100644
--- a/resources/assets/sass/pages/page-messenger.scss
+++ b/resources/assets/sass/pages/page-messenger.scss
@@ -547,22 +547,18 @@
}
}
}
+ .messenger-line {
+ flex-shrink: 0;
+ width: 1px;
+ height: 100%;
+ background-color: #f4f5f5;
+ }
.messenger-msg {
flex: 1;
width: 0;
height: 100%;
display: flex;
position: relative;
- &:before {
- content: "";
- position: absolute;
- top: 0;
- left: 0;
- height: 100%;
- width: 1px;
- background-color: #f4f5f5;
- z-index: 2;
- }
.msg-dialog-bg {
position: absolute;
top: 0;
@@ -727,6 +723,7 @@ body.window-portrait {
}
}
}
+ .messenger-line,
.messenger-msg {
display: none;
}