diff --git a/lib/zin/wg/detailcard/v1.php b/lib/zin/wg/detailcard/v1.php index d34451e1e7..a907598891 100644 --- a/lib/zin/wg/detailcard/v1.php +++ b/lib/zin/wg/detailcard/v1.php @@ -35,7 +35,10 @@ class detailCard extends wg 'sections' => '?array', /* 内容区域。 */ - 'content' => '?array' + 'content' => '?array', + + /* 是否删除。 */ + 'deleted' => '?bool' ); protected static array $defineBlocks = array @@ -94,7 +97,7 @@ class detailCard extends wg protected function buildTitle() { - list($objectID, $title, $url, $color) = $this->prop(array('objectID', 'title', 'url', 'color')); + list($objectID, $title, $url, $color, $deleted) = $this->prop(array('objectID', 'title', 'url', 'color', 'deleted')); $titleBlock = $this->block('title'); $titleView = $title; @@ -107,6 +110,7 @@ class detailCard extends wg set::idClass('font-normal'), set::titleClass('text-base text-clip min-w-0 font-normal'), set::url($url), + set::deleted($deleted), $titleBlock ); } diff --git a/module/task/model.php b/module/task/model.php index b27a74b23b..26539e1aa3 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -1331,7 +1331,7 @@ class taskModel extends model if(common::isTutorialMode()) return $this->loadModel('tutorial')->getTask(); if($vision == '') $vision = $this->config->vision; // TODO: $vision is for compatibling with viewing drill data. - $task = $this->dao->select('t1.*, t2.id AS storyID, t2.title AS storyTitle, t2.version AS latestStoryVersion, t2.status AS storyStatus') + $task = $this->dao->select('t1.*, t2.id AS storyID, t2.title AS storyTitle, t2.version AS latestStoryVersion, t2.status AS storyStatus, t2.deleted as storyDeleted') ->from(TABLE_TASK)->alias('t1') ->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story = t2.id') ->where('t1.id')->eq($taskID) diff --git a/module/task/ui/view.html.php b/module/task/ui/view.html.php index 78cf0e66c9..f969c02cad 100644 --- a/module/task/ui/view.html.php +++ b/module/task/ui/view.html.php @@ -116,6 +116,7 @@ if(!$task->fromBug && $task->story) 'url' => createLink('story', 'view', "storyID=$task->storyID") . ($execution->multiple ? '' : '#app=project'), 'objectID' => $task->storyID, 'color' => '', + 'deleted' => $task->storyDeleted, 'toolbar' => $task->needConfirm ? array ( array('text' => $lang->task->storyChange, 'class' => 'ghost pointer-events-none'),