From e750d2ae80d69d782c3ec2192b331abcae6ddb27 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Sun, 29 May 2022 12:32:37 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E8=A7=A6=E6=91=B8=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E4=B8=AD=E7=A6=81=E6=AD=A2=E6=BB=9A=E5=8A=A8=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                          |  2 +-
 resources/assets/js/components/Mobile/Back.vue        | 10 +++++++---
 .../js/pages/manage/components/DialogWrapper.vue      | 11 ++++++++---
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 870ff62bb..4306e3739 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
         "vue-resize-observer": "^2.0.16",
         "vue-router": "^3.5.3",
         "vue-template-compiler": "^2.6.14",
-        "vue-virtual-scroller-hi": "^1.0.10-1",
+        "vue-virtual-scroller-hi": "^1.0.10-2",
         "vuedraggable": "^2.24.3",
         "vuex": "^3.6.2",
         "webpack": "^5.69.1",
diff --git a/resources/assets/js/components/Mobile/Back.vue b/resources/assets/js/components/Mobile/Back.vue
index 0d287e9c1..8aee268e6 100644
--- a/resources/assets/js/components/Mobile/Back.vue
+++ b/resources/assets/js/components/Mobile/Back.vue
@@ -1,8 +1,10 @@
 <template>
-    <div class="mobile-back" :style="style"></div>
+    <div v-if="show" class="mobile-back" :style="style"></div>
 </template>
 
 <script>
+import {mapState} from "vuex";
+
 export default {
     name: "MobileBack",
     props: {
@@ -37,10 +39,12 @@ export default {
     },
 
     computed: {
+        ...mapState(['windowScrollY']),
+
         style() {
             return {
-                top: this.y + 'px',
-                left: this.x > 20 && this.show ? 0 : '-50px',
+                top: (this.y + this.windowScrollY) + 'px',
+                left: this.x > 20 ? 0 : '-50px',
             }
         },
     },
diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue
index 12c857a9a..e0cd35d7f 100644
--- a/resources/assets/js/pages/manage/components/DialogWrapper.vue
+++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue
@@ -65,10 +65,14 @@
         </slot>
         <DynamicScroller
             ref="scroller"
+            class="dialog-scroller"
+            :class="{
+                'overlay-y': !touchBackInProgress
+            }"
+            :disabled="touchBackInProgress"
             :items="allMsgs"
             :min-item-size="58"
-            @onScroll="onScroll"
-            class="dialog-scroller overlay-y">
+            @onScroll="onScroll">
             <template #before>
                 <template v-if="allMsgs.length === 0">
                     <div v-if="dialogData.loading > 0" class="dialog-item loading"><Loading/></div>
@@ -239,7 +243,8 @@ export default {
             'cacheDialogs',
             'dialogMsgs',
             'wsOpenNum',
-            'windowScrollY'
+            'windowScrollY',
+            'touchBackInProgress'
         ]),
 
         isReady() {