gitee/dootask
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
aipaw 2021-06-18 08:55:36 +08:00
parent e3baba3340
commit c88584125e
4 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -472,10 +472,7 @@ class ProjectController extends AbstractController
return Base::retError('项目不存在或不在成员列表内'); return Base::retError('项目不存在或不在成员列表内');
} }
// //
if ($column->deleteColumn()) { return $column->deleteColumn();
return Base::retSuccess('删除成功', ['id' => $column->id]);
}
return Base::retError('删除失败');
} }
/** /**

14
app/Models/ProjectColumn.php
View File

@ -62,11 +62,11 @@ class ProjectColumn extends AbstractModel
/** /**
* 删除列表 * 删除列表
* @param bool $pushMsg 是否推送 * @param bool $pushMsg 是否推送
* @return bool * @return array
*/ */
public function deleteColumn($pushMsg = true) public function deleteColumn($pushMsg = true)
{ {
$result = AbstractModel::transaction(function () use ($pushMsg) { return AbstractModel::transaction(function () use ($pushMsg) {
$tasks = ProjectTask::whereColumnId($this->id)->get(); $tasks = ProjectTask::whereColumnId($this->id)->get();
foreach ($tasks as $task) { foreach ($tasks as $task) {
$task->deleteTask($pushMsg); $task->deleteTask($pushMsg);
@ -74,11 +74,10 @@ class ProjectColumn extends AbstractModel
$this->delete(); $this->delete();
$this->addLog("删除列表：" . $this->name); $this->addLog("删除列表：" . $this->name);
if ($pushMsg) { if ($pushMsg) {
$this->pushMsg("delete", $this->toArray()); $this->pushMsg("delete");
} }
return Base::retSuccess('删除成功', $this->toArray()); return Base::retSuccess('删除成功', $this->toArray());
}); });
return Base::isSuccess($result);
} }
/** /**
@ -103,7 +102,7 @@ class ProjectColumn extends AbstractModel
/** /**
* 推送消息 * 推送消息
* @param string $action * @param string $action
* @param array $data 发送内容，默认为[id=>列表ID] * @param array $data 发送内容，默认为[id, project_id]
* @param array $userid 指定会员，默认为项目所有成员 * @param array $userid 指定会员，默认为项目所有成员
*/ */
public function pushMsg($action, $data = null, $userid = null) public function pushMsg($action, $data = null, $userid = null)
@ -112,7 +111,10 @@ class ProjectColumn extends AbstractModel
return; return;
} }
if ($data === null) { if ($data === null) {
$data = ['id' => $this->id]; $data = [
'id' => $this->id,
'project_id' => $this->project_id,
];
} }
if ($userid === null) { if ($userid === null) {
$userid = $this->project->relationUserids(); $userid = $this->project->relationUserids();

17
app/Models/ProjectTask.php
View File

@ -561,7 +561,7 @@ class ProjectTask extends AbstractModel
/** /**
* 归档任务、取消归档 * 归档任务、取消归档
* @param Carbon|null $archived_at 归档时间 * @param Carbon|null $archived_at 归档时间
* @return array|bool * @return array
*/ */
public function archivedTask($archived_at) public function archivedTask($archived_at)
{ {
@ -574,7 +574,7 @@ class ProjectTask extends AbstractModel
// 归档任务 // 归档任务
$this->archived_at = $archived_at; $this->archived_at = $archived_at;
$this->addLog("任务归档：" . $this->name); $this->addLog("任务归档：" . $this->name);
$this->pushMsg('archived', $this->toArray()); $this->pushMsg('archived');
} }
$this->save(); $this->save();
return Base::retSuccess('保存成功', $this->toArray()); return Base::retSuccess('保存成功', $this->toArray());
@ -584,7 +584,7 @@ class ProjectTask extends AbstractModel
/** /**
* 删除任务 * 删除任务
* @param bool $pushMsg 是否推送 * @param bool $pushMsg 是否推送
* @return array|bool * @return array
*/ */
public function deleteTask($pushMsg = true) public function deleteTask($pushMsg = true)
{ {
@ -595,7 +595,7 @@ class ProjectTask extends AbstractModel
$this->delete(); $this->delete();
$this->addLog("删除{任务}：" . $this->name); $this->addLog("删除{任务}：" . $this->name);
if ($pushMsg) { if ($pushMsg) {
$this->pushMsg('delete', $this->toArray()); $this->pushMsg('delete');
} }
return Base::retSuccess('删除成功', $this->toArray()); return Base::retSuccess('删除成功', $this->toArray());
}); });
@ -624,7 +624,7 @@ class ProjectTask extends AbstractModel
/** /**
* 推送消息 * 推送消息
* @param string $action * @param string $action
* @param array $data 发送内容，默认为[id=>任务ID] * @param array $data 发送内容，默认为[id, parent_id, project_id, column_id]
* @param array $userid 指定会员，默认为项目所有成员 * @param array $userid 指定会员，默认为项目所有成员
*/ */
public function pushMsg($action, $data = null, $userid = null) public function pushMsg($action, $data = null, $userid = null)
@ -633,7 +633,12 @@ class ProjectTask extends AbstractModel
return; return;
} }
if ($data === null) { if ($data === null) {
$data = ['id' => $this->id]; $data = [
'id' => $this->id,
'parent_id' => $this->parent_id,
'project_id' => $this->project_id,
'column_id' => $this->column_id,
];
} }
if ($userid === null) { if ($userid === null) {
$userid = $this->project->relationUserids(); $userid = $this->project->relationUserids();

2
resources/assets/js/store/mutations.js vendored
View File

@ -30,7 +30,7 @@ export default {
/** /**
* 删除列表 * 删除列表
* @param state * @param state
* @param data * @param data {id, project_id}
*/ */
columnDeleteSuccess(state, data) { columnDeleteSuccess(state, data) {
if (state.projectDetail.id == data.project_id) { if (state.projectDetail.id == data.project_id) {