github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-02-22 00:10:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

优化消息加载

Browse Source
This commit is contained in:
kuaifan 2022-06-14 09:58:45 +08:00
parent 643ccc4880
commit 02b2e8cffb
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
resources/assets/js/store/actions.js vendored
View File

@ -2211,20 +2211,22 @@ export default {
page: dialog.currentPage page: dialog.currentPage
}, },
}).then(result => { }).then(result => {
dialog.loading = false; const resData = result.data;
dialog.currentPage = result.data.current_page; dialog.currentPage = resData.current_page;
dialog.hasMorePages = !!result.data.next_page_url; dialog.hasMorePages = !!resData.next_page_url;
dialog = Object.assign(dialog, resData.dialog)
// //
const ids = result.data.data.map(({id}) => id) const ids = resData.data.map(({id}) => id)
state.dialogMsgs = state.dialogMsgs.filter((item) => item.dialog_id != dialog_id || ids.includes(item.id)); state.dialogMsgs = state.dialogMsgs.filter((item) => item.dialog_id != dialog_id || ids.includes(item.id));
// //
dispatch("saveDialog", result.data.dialog); dispatch("saveDialogMsg", resData.data);
dispatch("saveDialogMsg", result.data.data);
resolve() resolve()
}).catch(e => { }).catch(e => {
console.warn(e); console.warn(e);
dialog.loading = false;
resolve() resolve()
}).finally(_ => {
dialog.loading = false;
dispatch("saveDialog", dialog);
}); });
}); });
}, },
@ -2260,10 +2262,11 @@ export default {
page: dialog.currentPage page: dialog.currentPage
}, },
}).then(result => { }).then(result => {
const resData = result.data;
dialog.loading = false; dialog.loading = false;
dialog.currentPage = result.data.current_page; dialog.currentPage = resData.current_page;
dialog.hasMorePages = !!result.data.next_page_url; dialog.hasMorePages = !!resData.next_page_url;
dispatch("saveDialogMsg", result.data.data); dispatch("saveDialogMsg", resData.data);
resolve(result) resolve(result)
}).catch(e => { }).catch(e => {
console.warn(e); console.warn(e);

4
resources/assets/sass/pages/components/dialog-wrapper.scss vendored
View File

@ -651,7 +651,7 @@
justify-content: center; justify-content: center;
font-size: 13px; font-size: 13px;
padding: 3px 0; padding: 3px 0;
margin: 12px 0; margin: 0 0 12px;
opacity: 0.6; opacity: 0.6;
transition: opacity 0.2s; transition: opacity 0.2s;
@ -681,7 +681,7 @@
} }
&.loading { &.loading {
padding: 12px 0; padding: 0 0 12px;
justify-content: center; justify-content: center;
.common-loading { .common-loading {