From 3399ea73d08201009a3562f6c6a89d85e679c451 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Mon, 20 Feb 2023 19:26:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=81=8A=E5=A4=A9=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E6=A1=86=E7=B2=98=E8=B4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assets/js/pages/manage/components/ChatInput/index.vue  | 4 +++-
 .../assets/js/pages/manage/components/DialogWrapper.vue    | 7 +++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/resources/assets/js/pages/manage/components/ChatInput/index.vue b/resources/assets/js/pages/manage/components/ChatInput/index.vue
index c674891e8..6b0ab4cfb 100755
--- a/resources/assets/js/pages/manage/components/ChatInput/index.vue
+++ b/resources/assets/js/pages/manage/components/ChatInput/index.vue
@@ -668,7 +668,6 @@ export default {
                 }
                 delta.ops = delta.ops.map(op => {
                     const obj = {
-                        attributes: {},
                         insert: op.insert
                     };
                     try {
@@ -680,6 +679,9 @@ export default {
                     if (op.attributes) {
                         ['bold', 'strike', 'italic', 'underline', 'list', 'blockquote', 'link'].some(item => {
                             if (op.attributes[item]) {
+                                if (typeof obj.attributes === "undefined") {
+                                    obj.attributes = {}
+                                }
                                 obj.attributes[item] = op.attributes[item]
                             }
                         })
diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue
index 9f92e0f8f..8ea13f864 100644
--- a/resources/assets/js/pages/manage/components/DialogWrapper.vue
+++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue
@@ -141,7 +141,7 @@
         </VirtualList>
 
         <!--底部输入-->
-        <div class="dialog-footer" :class="footerClass" @click="onActive">
+        <div ref="footer" class="dialog-footer" :class="footerClass" @click="onActive">
             <div class="dialog-newmsg" @click="onToBottom">{{$L(`有${msgNew}条新消息`)}}</div>
             <div class="dialog-goto" @click="onToBottom"><i class="taskfont">&#xe72b;</i></div>
             <DialogUpload
@@ -902,6 +902,9 @@ export default {
                 if (tail <= 10) {
                     requestAnimationFrame(this.onToBottom)
                 }
+                if (this.$refs.input.isFocus) {
+                    $A.scrollToView(this.$refs.footer)
+                }
             }
         },
 
@@ -1935,7 +1938,7 @@ export default {
                 case 'text':
                     const copyEl = $A(this.$refs.scroller.$el).find(`[data-id="${this.operateItem.id}"]`).find('.dialog-content')
                     if (copyEl.length > 0) {
-                        const text = copyEl[0].innerText.replace(/\n\n/g, "\n")
+                        const text = copyEl[0].innerText.replace(/\n\n/g, "\n").replace(/(^\s*)|(\s*$)/g, "")
                         this.$copyText(text).then(_ => $A.messageSuccess('复制成功')).catch(_ => $A.messageError('复制失败'))
                     } else {
                         $A.messageWarning('不可复制的内容');