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

perf: 任务详情窗口通过附件传图片保存到附件列表

Browse Source
This commit is contained in:
kuaifan 2022-04-13 12:01:31 +08:00
parent 003ddb4016
commit fd40ae6b67
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -262,6 +262,7 @@ class DialogController extends AbstractController
* @apiName msg__sendfile * @apiName msg__sendfile
* *
* @apiParam {Number} dialog_id 对话ID * @apiParam {Number} dialog_id 对话ID
* @apiParam {Number} [image_attachment] 图片是否也存到附件
* @apiParam {String} [filename] post-文件名称 * @apiParam {String} [filename] post-文件名称
* @apiParam {String} [image64] post-base64图片（二选一） * @apiParam {String} [image64] post-base64图片（二选一）
* @apiParam {File} [files] post-文件对象（二选一） * @apiParam {File} [files] post-文件对象（二选一）
@ -275,6 +276,7 @@ class DialogController extends AbstractController
$user = User::auth(); $user = User::auth();
// //
$dialog_id = Base::getPostInt('dialog_id'); $dialog_id = Base::getPostInt('dialog_id');
$image_attachment = Base::getPostInt('image_attachment');
// //
$dialog = WebSocketDialog::checkDialog($dialog_id); $dialog = WebSocketDialog::checkDialog($dialog_id);
// //
@ -304,7 +306,7 @@ class DialogController extends AbstractController
$fileData['size'] *= 1024; $fileData['size'] *= 1024;
// //
if ($dialog->type === 'group' && $dialog->group_type === 'task') { // 任务群聊保存文件 if ($dialog->type === 'group' && $dialog->group_type === 'task') { // 任务群聊保存文件
if (!in_array($fileData['ext'], File::localExt)) { // 如果是图片不保存 if ($image_attachment || !in_array($fileData['ext'], File::imageExt)) { // 如果是图片不保存
$task = ProjectTask::whereDialogId($dialog->id)->first(); $task = ProjectTask::whereDialogId($dialog->id)->first();
if ($task) { if ($task) {
$file = ProjectTaskFile::createInstance([ $file = ProjectTaskFile::createInstance([

2
package.json
View File

@ -64,7 +64,7 @@
"stylus-loader": "^6.2.0", "stylus-loader": "^6.2.0",
"tinymce": "^5.10.3", "tinymce": "^5.10.3",
"tui-calendar-hi": "^1.15.1-5", "tui-calendar-hi": "^1.15.1-5",
"view-design-hi": "^4.7.0-19", "view-design-hi": "^4.7.0-20",
"vue": "^2.6.14", "vue": "^2.6.14",
"vue-clipboard2": "^0.3.3", "vue-clipboard2": "^0.3.3",
"vue-emoji-picker": "^1.0.3", "vue-emoji-picker": "^1.0.3",

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

@ -1123,7 +1123,11 @@ export default {
sendDialogMsg() { sendDialogMsg() {
if (this.msgFile.length > 0) { if (this.msgFile.length > 0) {
this.$refs.dialog.sendFileMsg(this.msgFile); this.$refs.dialog.sendFileMsg(this.msgFile.map(file => Object.assign(file, {
ajaxExtraData: {
image_attachment: 1
}
})));
} else if (this.msgText) { } else if (this.msgText) {
this.$refs.dialog.sendMsg(this.msgText); this.$refs.dialog.sendMsg(this.msgText);
} }