perf: 项目、消息对话置顶后要滚动到可以看到它的位置

FoXiMao · Mar 6, 2022 · 41ceb9b · 41ceb9b
1 parent b0b7c63
commit 41ceb9b
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 17 deletions.
diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue
@@ -889,9 +889,17 @@ export default {
                     project_id: this.topOperateItem.id,
                 },
             }).then(() => {
-                this.$store.dispatch("getProjects").catch(() => {});
+                this.$store.dispatch("getProjects").then(() => {
+                    let active = this.$refs.projectWrapper.querySelector(".active")
+                    if (active) {
+                        $A.scrollToView(active, {
+                            behavior: 'smooth',
+                            scrollMode: 'if-needed',
+                        });
+                    }
+                }).catch(() => {});
             }).catch(({msg}) => {
-                $A.modalError(msg, 301);
+                $A.modalError(msg);
             });
         },
 

diff --git a/resources/assets/js/pages/manage/messenger.vue b/resources/assets/js/pages/manage/messenger.vue
@@ -470,11 +470,11 @@ export default {
                     dialog_id: this.topOperateItem.id,
                 },
             }).then(() => {
-                this.$store.dispatch("getDialogs");
-                this.$Modal.remove();
+                this.$store.dispatch("getDialogs").then(() => {
+                    this.scrollIntoActive(true)
+                });
             }).catch(({msg}) => {
-                $A.modalError(msg, 301);
-                this.$Modal.remove();
+                $A.modalError(msg);
             });
         }
     }

diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js
@@ -205,7 +205,7 @@ export default {
      */
     getBasicData({dispatch}) {
         dispatch("getProjects").catch(() => {});
-        dispatch("getDialogs");
+        dispatch("getDialogs").catch(() => {});
         dispatch("getTaskForDashboard");
     },
 
@@ -1813,18 +1813,24 @@ export default {
      * 获取会话列表
      * @param state
      * @param dispatch
+     * @returns {Promise<unknown>}
      */
     getDialogs({state, dispatch}) {
-        if (state.userId === 0) {
-            state.cacheDialogs = [];
-            return;
-        }
-        dispatch("call", {
-            url: 'dialog/lists',
-        }).then(result => {
-            dispatch("saveDialog", result.data.data);
-        }).catch(e => {
-            console.warn(e);
+        return new Promise(function (resolve, reject) {
+            if (state.userId === 0) {
+                state.cacheDialogs = [];
+                reject({msg: 'Parameter error'});
+                return;
+            }
+            dispatch("call", {
+                url: 'dialog/lists',
+            }).then(result => {
+                dispatch("saveDialog", result.data.data);
+                resolve(result)
+            }).catch(e => {
+                console.warn(e);
+                reject(e)
+            });
         });
     },