github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-02-23 09:20:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 不是任务负责人不能通过小窗口发送任务消息的问题

Browse Source
This commit is contained in:
kuaifan 2022-06-09 11:44:30 +08:00
parent f05914f2a1
commit 66961197f6
2 changed files with 37 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Api/ProjectController.php
View File

@ -1504,7 +1504,7 @@ class ProjectController extends AbstractController
*/ */
public function task__dialog() public function task__dialog()
{ {
User::auth(); $user = User::auth();
// //
$task_id = intval(Request::input('task_id')); $task_id = intval(Request::input('task_id'));
// //
@ -1529,9 +1529,11 @@ class ProjectController extends AbstractController
}); });
// //
$task->pushMsg('dialog'); $task->pushMsg('dialog');
$dialogData = WebSocketDialog::find($task->dialog_id)?->formatData($user->userid);
return Base::retSuccess('success', [ return Base::retSuccess('success', [
'id' => $task->id, 'id' => $task->id,
'dialog_id' => $task->dialog_id, 'dialog_id' => $task->dialog_id,
'dialog_data' => $dialogData,
]); ]);
} }

68
resources/assets/js/pages/manage/components/TaskDetail.vue
View File

@ -1103,43 +1103,43 @@ export default {
task_id: this.taskDetail.id, task_id: this.taskDetail.id,
}, },
}).then(({data}) => { }).then(({data}) => {
this.$store.dispatch("saveTask", data); this.$store.dispatch("saveTask", {
this.$store.dispatch("getDialogOne", data.dialog_id).then(() => { id: data.id,
if ($A.isSubElectron) { dialog_id: data.dialog_id,
this.resizeDialog().then(() => {
this.sendDialogMsg();
});
} else {
this.$nextTick(() => {
if (this.windowSmall) {
$A.onBlur();
this.$store.state.dialogMsgTransfer = {
time: $A.Time() + 10,
msgRecord: this.msgRecord,
msgFile: this.msgFile,
msgText: typeof msgText === 'string' && msgText ? msgText : this.msgText,
};
this.msgRecord = {};
this.msgFile = [];
this.msgText = "";
if (this.dialogId > 0) {
// 如果当前打开着对话窗口则关闭任务窗口
this.$store.dispatch("openTask", 0);
}
this.$store.dispatch('openDialog', data.dialog_id)
} else {
this.sendDialogMsg();
}
});
}
}).catch(({msg}) => {
$A.modalError(msg);
}).finally(_ => {
this.sendLoad--;
}); });
this.$store.dispatch("saveDialog", data.dialog_data);
//
if ($A.isSubElectron) {
this.resizeDialog().then(() => {
this.sendDialogMsg();
});
} else {
this.$nextTick(() => {
if (this.windowSmall) {
$A.onBlur();
this.$store.state.dialogMsgTransfer = {
time: $A.Time() + 10,
msgRecord: this.msgRecord,
msgFile: this.msgFile,
msgText: typeof msgText === 'string' && msgText ? msgText : this.msgText,
};
this.msgRecord = {};
this.msgFile = [];
this.msgText = "";
if (this.dialogId > 0) {
// 如果当前打开着对话窗口则关闭任务窗口
this.$store.dispatch("openTask", 0);
}
this.$store.dispatch('openDialog', data.dialog_id)
} else {
this.sendDialogMsg();
}
});
}
}).catch(({msg}) => { }).catch(({msg}) => {
this.sendLoad--;
$A.modalError(msg); $A.modalError(msg);
}).finally(_ => {
this.sendLoad--;
}); });
}, },