From 178b511a245fcc24b5042c8be8ad630fb6898f97 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Sun, 29 May 2022 12:03:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=84=A6=E7=82=B9=E4=BC=9A=E8=B6=85?=
 =?UTF-8?q?=E5=87=BA=E8=BE=93=E5=85=A5=E6=A1=86=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/components/ChatInput/index.vue     | 54 ++++++++++++-------
 .../pages/manage/components/DialogWrapper.vue |  8 +--
 2 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/resources/assets/js/pages/manage/components/ChatInput/index.vue b/resources/assets/js/pages/manage/components/ChatInput/index.vue
index f138c4e2a..2b5a9b8f1 100755
--- a/resources/assets/js/pages/manage/components/ChatInput/index.vue
+++ b/resources/assets/js/pages/manage/components/ChatInput/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="chat-input-box" :class="boxClass" v-clickoutside="hidePopover">
+    <div ref="aa" class="chat-input-box" :class="boxClass" v-clickoutside="hidePopover">
         <div class="chat-input-wrapper" @click.stop="focus">
             <!-- 输入框 -->
             <div
@@ -167,6 +167,7 @@ export default {
     data() {
         return {
             quill: null,
+            isFocus: false,
             rangeIndex: 0,
             _content: '',
             _options: {},
@@ -348,6 +349,30 @@ export default {
             this.$emit('on-more-visible-change', val)
         },
 
+        isFocus(val) {
+            if (this.timerScroll) {
+                clearInterval(this.timerScroll);
+            }
+            if (val) {
+                this.$emit('on-focus')
+                this.hidePopover()
+                if (this.isSpecVersion) {
+                    // ios11.0-11.3 对scrollTop及scrolIntoView解释有bug
+                    // 直接执行会导致输入框滚到底部被遮挡
+                } else {
+                    this.timerScroll = setInterval(() => {
+                        if (this.quill.hasFocus()) {
+                            $A.scrollToView(this.$refs.editor, true)
+                        } else {
+                            clearInterval(this.timerScroll);
+                        }
+                    }, 200);
+                }
+            } else {
+                this.$emit('on-blur')
+            }
+        },
+
         dialogInputCache() {
             this.$emit('input', this.getInputCache())
         }
@@ -455,27 +480,18 @@ export default {
 
             // Mark model as touched if editor lost focus
             this.quill.on('selection-change', range => {
-                if (this.timerScroll) {
-                    clearInterval(this.timerScroll);
-                }
                 if (!range) {
-                    this.$emit('on-blur', this.quill)
-                } else {
-                    this.$emit('on-focus', this.quill)
-                    this.hidePopover()
-                    if (this.isSpecVersion) {
-                        // ios11.0-11.3 对scrollTop及scrolIntoView解释有bug
-                        // 直接执行会导致输入框滚到底部被遮挡
-                    } else {
-                        this.timerScroll = setInterval(() => {
-                            if (this.quill.hasFocus()) {
-                                $A.scrollToView(this.$refs.editor, true)
-                            } else {
-                                clearInterval(this.timerScroll);
-                            }
-                        }, 200);
+                    // 修复光标会超出的问题
+                    if (this.quill.hasFocus()) {
+                        this.quill.setSelection(0)
+                        return
+                    }
+                    if (document.activeElement && document.activeElement.className === 'ql-clipboard') {
+                        this.quill.setSelection(this.quill.getLength())
+                        return
                     }
                 }
+                this.isFocus = !!range;
             })
 
             // Update model if text changes
diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue
index a0a378ad7..12c857a9a 100644
--- a/resources/assets/js/pages/manage/components/DialogWrapper.vue
+++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue
@@ -585,12 +585,12 @@ export default {
             this.onActive();
         },
 
-        onEventFocus(e) {
-            this.$emit("on-focus", e)
+        onEventFocus() {
+            this.$emit("on-focus")
         },
 
-        onEventBlur(e) {
-            this.$emit("on-blur", e)
+        onEventBlur() {
+            this.$emit("on-blur")
         },
 
         onEventMore(e) {