Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Adjust for unlink action.

Browse Source
This commit is contained in:
wangyidong
2023-06-25 18:38:22 +08:00
parent a6d42cf686
commit 75b984f06b
3 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/story/css/view.ui.css
+4 -2
View File
@@ -1,3 +1,5 @@
.detail-side .tab-pane{padding-top:8px;}
.detail-side .tab-pane ul li .label{margin-right:8px;}
.detail-side .tab-pane ul li .title{margin-right:8px;}
.detail-side .tab-pane ul li{display:flex; position:relative; padding-right:15px;}
.detail-side .tab-pane ul li .label{margin-right:8px; min-width:45px;}
.detail-side .tab-pane ul li .title{margin-right:8px; overflow:hidden; white-space:nowrap;}
.detail-side .tab-pane ul li .unlink{position:absolute; right:0px; top:2px;}
module/story/js/view.ui.js
+21
View File
@@ -3,8 +3,29 @@ $(document).on('mouseenter', '.detail-side .tab-pane ul li', function(e)
$(this).find('.unlink').removeClass('hidden');
e.stopPropagation();
});
$(document).on('mouseleave', '.detail-side .tab-pane ul li', function(e)
{
$(this).find('.unlink').addClass('hidden');
e.stopPropagation();
});
$(document).on('click', '.relievedTwins', function(e)
{
const $this = $(e.target).closest('li').find('.relievedTwins');
const postData = new FormData();
postData.append('twinID', $this.data('id'));
zui.Modal.confirm({message: relievedTip, icon:'icon-info-sign', iconClass: 'warning-pale rounded-full icon-2x'}).then((res) =>
{
if(res) $.post($.createLink('story', 'ajaxRelieveTwins'), postData, function(){$this.closest('li').remove()});
});
});
$(document).on('click', '.unlinkStory', function(e)
{
const $this = $(e.target).closest('li').find('.relievedTwins');
zui.Modal.confirm({message: unlinkStoryTip, icon:'icon-info-sign', iconClass: 'warning-pale rounded-full icon-2x'}).then((res) =>
{
if(res) $.get($this.data('url'), function(){$this.closest('li').remove()});
});
});
module/story/ui/view.html.php
+9 -10
View File
@@ -9,12 +9,11 @@ declare(strict_types=1);
* @link https://www.zentao.net
*/
namespace zin;
$twins[$story->id] = $story;
jsVar('relieveURL', inlink('ajaxRelieveTwins'));
jsVar('relieved', $lang->story->relieved);
jsVar('relievedTip', $lang->story->relievedTip);
jsVar('unlinkStoryTip', $lang->story->unlinkStory);
$isInModal = isAjaxRequest('modal');
$otherParam = 'storyID=&projectID=';
$tab = 'product';
if($this->app->rawModule == 'projectstory' or $this->app->tab == 'project')
@@ -99,7 +98,7 @@ foreach($story->tasks as $executionTasks)
$taskItems[] = h::li
(
set::title($task->name),
(isset($execution->type) && $execution->type == 'kanban' && isonlybody()) ? span(setClass('muted'), $executionName) : a(set::href($executionLink), setClass('muted'), $executionName),
(isset($execution->type) && $execution->type == 'kanban' && $isInModal) ? span(setClass('muted'), $executionName) : a(set::href($executionLink), setClass('muted'), $executionName),
label(setClass('circle'), $task->id),
common::hasPriv('task', 'view') ? a(set::href($this->createLink('task', 'view', "taskID=$task->id")), setClass('title'), set('data-toggle', 'modal'), $task->name) : span(setClass('title'), $task->name),
label(setClass('success'), $this->lang->task->statusList[$task->status]),
@@ -118,7 +117,7 @@ if(empty($story->tasks))
$taskItems[] = h::li
(
set::title($execution->name),
($execution->type == 'kanban' && isonlybody()) ? span(setClass('muted'), $executions[$executionID]) : a(set::href($this->createLink('execution', 'view', "executionID=$executionID")), setClass('muted'), $executions[$executionID]),
($execution->type == 'kanban' && $isInModal) ? span(setClass('muted'), $executions[$executionID]) : a(set::href($this->createLink('execution', 'view', "executionID=$executionID")), setClass('muted'), $executions[$executionID]),
);
}
}
@@ -154,7 +153,7 @@ detailHeader
$story->deleted ? span(setClass('label danger'), $lang->story->deleted) : null,
),
isonlybody() ? null : to::suffix
$isInModal ? null : to::suffix
(
btn
(
@@ -173,13 +172,13 @@ detailBody
section
(
set::title($lang->story->legendSpec),
set::content($story->spec),
set::content(empty($story->spec) ? $lang->noDesc : $story->spec),
set::useHtml(true)
),
section
(
set::title($lang->story->legendVerify),
set::content($story->verify),
set::content(empty($story->verify) ? $lang->noDesc : $story->verify),
set::useHtml(true)
),
// $this->fetch('file', 'printFiles', array('files' => $story->files, 'section' => 'true', 'object' => $story, 'method' => 'view', 'showDelete' => false)),
@@ -379,7 +378,7 @@ detailBody
label(setClass('circle'), $twin->id),
common::hasPriv('story', 'view') ? a(set::href($this->createLink('story', 'view', "id={$twin->id}")), setClass('title'), set::title($twin->title), set('data-toggle', 'modal'), $twin->title) : span(setClass('title'), $twin->title),
label(set::title($stage), $stage),
common::hasPriv('story', 'relieved') ? a(set::title($lang->story->relievedTwins), setClass("relievedTwins unlink hidden size-xs"), icon('unlink')) : null,
common::hasPriv('story', 'relieved') ? a(set::title($lang->story->relievedTwins), setClass("relievedTwins unlink hidden size-xs"), set('data-id', $twin->id), icon('unlink')) : null,
);
}, $twins))
),
@@ -406,7 +405,7 @@ detailBody
$canLinkStory ? a(set('data-url', helper::createLink('story', 'linkStory', "storyID=$story->id&type=remove&linkedID={$relation->id}&browseType=&queryID=0&storyType=$story->type")), setClass('unlink unlinkStory hidden'), icon('link')) : null,
);
}, $relations)),
!common::hasPriv($story->type, 'linkStory') ? null : h::li(a(set::href(helper::createLink('story', 'linkStory', "storyID=$story->id&type=linkStories&linkedID=0&browseType=&queryID=0&storyType=$story->type")), set('data-toggle', 'modal'), set::id('linkButton'), setClass('btn secondary size-sm'), $lang->story->link . ($story->type == 'story' ? $lang->story->requirement : $lang->story->story))),
!common::hasPriv($story->type, 'linkStory') ? null : h::li(a(set::href(helper::createLink('story', 'linkStory', "storyID=$story->id&type=linkStories&linkedID=0&browseType=&queryID=0&storyType=$story->type")), set('data-toggle', 'modal'), set::id('linkButton'), setClass('btn secondary size-sm'), icon('plus'), $lang->story->link . ($story->type == 'story' ? $lang->story->requirement : $lang->story->story))),
)
) : null,
$story->type == 'story' ? tabPane