github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-15 13:22:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf: 审批和任务通知优化

Browse Source
This commit is contained in:
weifs 2024-04-25 11:24:30 +08:00
parent 30676fb761
commit 693fa46688
4 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Api/ApproveController.php
View File

@ -1000,7 +1000,7 @@ class ApproveController extends AbstractController
}
//
try {
$msg = WebSocketDialogMsg::sendMsg($msg_action, $dialog->id, 'text', ['text' => $text, 'approve_type' => $type], $botUser->userid, false, false, true);
$msg = WebSocketDialogMsg::sendMsg($msg_action, $dialog->id, 'text', ['text' => $text, 'approve_type' => $type], $process['start_user_id'], false, false, true);
// 关联信息
if ($action == 'start') {
$proc_msg = new ApproveProcMsg();

6
app/Models/ProjectTask.php
View File

@ -1667,7 +1667,9 @@ class ProjectTask extends AbstractModel
if (empty($receivers)) {
return;
}
//
$userid = User::userid();
//
$botUser = User::botGetOrCreate('task-alert');
if (empty($botUser)) {
return;
@ -1699,7 +1701,7 @@ class ProjectTask extends AbstractModel
ProjectTaskPushLog::createInstance($data)->save();
WebSocketDialogMsg::sendMsg(null, $dialog->id, 'text', [
'text' => str_replace("您的任务", $replace, $text) . $suffix
], $botUser->userid);
], in_array($type, [0, 3]) ? $userid : $botUser->userid);
}
}
}

15
resources/assets/sass/dark.scss vendored
View File

@ -261,6 +261,21 @@ body.dark-mode-reverse {
}
}
}
.open-approve-details {
.ivu-btn-primary {
background-color: #d34521;
border-color: #d34521;
}
.ivu-btn-grey {
background-color: #9e9e9e;
border-color: #969696;
&:hover {
background-color: #959595;
border-color: #959595;
}
}
}
}
.dialog-emoji {

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

@ -1474,6 +1474,17 @@
}
}
&.self {
.dialog-view{
.open-approve-details {
.ivu-btn-grey {
background-color: #efefef;
border-color: #f3f3f3;
}
}
}
}
.dialog-action {
align-self: flex-start;
display: flex;