From b4b268a4d774f14395ec0a51d15c2637f4dde8d2 Mon Sep 17 00:00:00 2001
From: Pang <aipaw@live.cn>
Date: Fri, 5 Jan 2024 06:55:15 +0800
Subject: [PATCH] no message

---
 language/original-web.txt                     |  4 +++
 .../pages/manage/components/DialogWrapper.vue | 28 +++++++++++++------
 resources/assets/js/store/actions.js          |  4 +--
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/language/original-web.txt b/language/original-web.txt
index 663cdd4b2..dc0a8dd2b 100644
--- a/language/original-web.txt
+++ b/language/original-web.txt
@@ -1502,3 +1502,7 @@ License Key
 你确定取消置顶吗？
 
 打包下载(*)
+
+数据已超过(*)条，是否继续加载？
+版本过低
+服务器接口版本过低，部分功能可能无法正常使用。
diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue
index 3561fb6ea..9f4b39ac5 100644
--- a/resources/assets/js/pages/manage/components/DialogWrapper.vue
+++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue
@@ -757,7 +757,6 @@ export default {
             unreadMsgId: 0,                     // 最早未读消息id
             positionLoad: 0,                    // 定位跳转加载中
             positionShow: false,                // 定位跳转显示
-            renderMsgOffset: 0,                 // 渲染滚动距离
             renderMsgLength: 0,                 // 渲染消息长度
             msgPreparedStatus: false,           // 消息准备完成
             listPreparedStatus: false,          // 列表准备完成
@@ -1150,10 +1149,7 @@ export default {
                         dialog_id,
                         msg_id: this.msgId,
                         msg_type: this.msgType,
-                        save_before: _ => {
-                            const {tail} = this.scrollInfo();
-                            this.renderMsgOffset = tail > 55 ? (this.$refs.scroller.getScrollSize() - this.$refs.scroller.getOffset()) : 0
-                        }
+                        save_before: _ => this.onMarkOffset(false)
                     }).then(_ => {
                         this.openId = dialog_id
                         this.listPreparedStatus = true
@@ -2144,6 +2140,23 @@ export default {
             }
         },
 
+        onMarkOffset(recovery = false) {
+            const scroller = this.$refs.scroller
+            if (!scroller) {
+                return false
+            }
+            if (recovery) {
+                if (this.__markOffset === undefined) {
+                    return false
+                }
+                this.onToOffset(scroller.getScrollSize() - this.__markOffset)
+                this.__markOffset = undefined
+            } else {
+                this.__markOffset = scroller.getScrollSize() - scroller.getOffset()
+            }
+            return true
+        },
+
         scrollInfo() {
             const scroller = this.$refs.scroller;
             if (scroller) {
@@ -2234,10 +2247,7 @@ export default {
             if (this.renderMsgLength > 0 && this.$refs.scroller.getSizes() >= this.renderMsgLength) {
                 this.renderMsgLength = 0
                 this.onFooterResize()
-                if (this.renderMsgOffset > 0) {
-                    this.onToOffset(this.$refs.scroller.getScrollSize() - this.renderMsgOffset)
-                    this.renderMsgOffset = 0
-                } else {
+                if (!this.onMarkOffset(true)) {
                     this.onToBottom()
                 }
             }
diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js
index b8fbe5b43..f1e80b9e4 100644
--- a/resources/assets/js/store/actions.js
+++ b/resources/assets/js/store/actions.js
@@ -1586,8 +1586,8 @@ export default {
                 //
                 if (data.next_page_url) {
                     requestData.page = data.current_page + 1
-                    if (data.current_page % 20 === 0) {
-                        $A.modalWarning({
+                    if (data.current_page % 30 === 0) {
+                        $A.modalConfirm({
                             content: "数据已超过" + data.to + "条，是否继续加载？",
                             onOk: () => {
                                 dispatch("getTasks", requestData).then(resolve).catch(reject)