github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-03-17 11:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

仅定位消息位置才显示超时spinner

Browse Source
This commit is contained in:
kuaifan 2022-07-18 07:47:40 +08:00
parent 2462d457a7
commit 127aaa30f4
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
resources/assets/js/pages/manage/components/DialogWrapper.vue
View File

@ -1099,7 +1099,8 @@ export default {
dialog_id: this.dialogId, dialog_id: this.dialogId,
msg_id: this.msgId, msg_id: this.msgId,
msg_type: this.msgType, msg_type: this.msgType,
position_id position_id,
spinner: 2000
}).finally(_ => { }).finally(_ => {
const index = this.allMsgs.findIndex(item => item.id === position_id) const index = this.allMsgs.findIndex(item => item.id === position_id)
if (index > -1) { if (index > -1) {

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

@ -2270,15 +2270,26 @@ export default {
* @param state * @param state
* @param dispatch * @param dispatch
* @param getters * @param getters
* @param data {dialog_id, msg_id, ?msg_type, ?position_id, ?prev_id, ?next_id, ?save_before, ?clear_before} * @param data {dialog_id, msg_id, ?msg_type, ?position_id, ?prev_id, ?next_id, ?save_before, ?clear_before, ?spinner}
* @returns {Promise<unknown>} * @returns {Promise<unknown>}
*/ */
getDialogMsgs({state, dispatch, getters}, data) { getDialogMsgs({state, dispatch, getters}, data) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const saveBefore = typeof data.save_before === "function" ? data.save_before : _ => {} let saveBefore = _ => {}
const clearBefore = typeof data.clear_before === "boolean" ? data.clear_before : false let clearBefore = false
if (typeof data.save_before !== "undefined") delete data.save_before let spinner = false
if (typeof data.clear_before !== "undefined") delete data.clear_before if (typeof data.save_before !== "undefined") {
saveBefore = typeof data.save_before === "function" ? data.save_before : _ => {}
delete data.save_before
}
if (typeof data.clear_before !== "undefined") {
clearBefore = typeof data.clear_before === "boolean" ? data.clear_before : false
delete data.clear_before
}
if (typeof data.spinner !== "undefined") {
spinner = data.spinner
delete data.spinner
}
// //
const loadKey = `msg::${data.dialog_id}-${data.msg_id}-${data.msg_type || ''}` const loadKey = `msg::${data.dialog_id}-${data.msg_id}-${data.msg_type || ''}`
if (getters.isLoad(loadKey)) { if (getters.isLoad(loadKey)) {
@ -2294,7 +2305,7 @@ export default {
dispatch("call", { dispatch("call", {
url: 'dialog/msg/list', url: 'dialog/msg/list',
data, data,
spinner: 3000, spinner,
complete: _ => dispatch("cancelLoad", loadKey) complete: _ => dispatch("cancelLoad", loadKey)
}).then(result => { }).then(result => {
saveBefore() saveBefore()