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

* fix xuanxuan 84's bug

Browse Source
This commit is contained in:
chaideqing
2021-12-07 09:27:40 +08:00
parent e4df2494bd
commit 9a2148a540
22 changed files with 150 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
module/execution/css/story.css
View File

@@ -1,13 +1,12 @@
#linkButton {border-radius: 4px !important;}
tbody > tr > td > .btn-icon {margin-right: 4px;}
.table td.c-estimate {padding-right: 12px;}
#linkButton {border-radius: 4px !important; cursor: pointer;}
#batchToTask .checkbox-primary {display: inline-block; margin-left: 10px;}
#modules a.active {color: #0c64eb;}
@media (max-width: 1200px) {#storyList .c-user, #storyList .c-estimate {display: none !important;};}
@media (max-width: 1000px) {#storyList .c-status, #storyList .c-pri {display: none !important;};}
@media (max-width: 820px) {#storyList .c-sort, #storyList .c-stage {display: none !important;};}
#batchToTask .checkbox-primary {display: inline-block; margin-left: 10px;}
th.c-pri{width:50px;}
.c-estimate {width: 50px;}
tbody > tr > td > .btn-icon {margin-right: 4px;}
th.c-pri, .c-estimate {width:50px;}
.table td.c-estimate {padding-right: 12px;}
.c-status, .c-user {width: 70px;}
.c-category {width: 80px;}
.c-actions-7 {width: 190px;}

24
module/execution/css/x.bug.css
View File

@@ -1,22 +1,18 @@
#mainMenu {display: none;}
#sidebar {display: none;}
.table-footer>.table-statistic {display: none;}
.checkbox-primary {display: none !important;}
.dropdown {display: none;}
#xx-title {background-color: #F2F2F2; padding-left: 15px; line-height: 40px;}
body {margin-bottom: 0px !important;}
#main {min-width: unset; height: 427px; overflow-y: overlay;}
#main > .container {width: 100% !important;}
#mainContent > .main-col {margin-top: 0px;}
.pager > li > .pager-size-menu {display: none;}
.table-footer > .table-actions {display: none;}
.table-footer{position: fixed !important; width: 100% !important; bottom: 0; z-index: -10 !important; background:none !important;}
.table-footer .pager:before {display: none !important;}
#mainMenu, #sidebar, .dropdown, .table-footer > .table-actions, .table-footer>.table-statistic, .pager > li > .pager-size-menu {display: none;}
#xx-title {background-color: #F2F2F2; padding-left: 15px; line-height: 40px;}
.checkbox-primary, .table-footer .pager:before {display: none !important;}
.main-table a {pointer-events: none;}
.table-footer {position: fixed !important; width: 100% !important; bottom: 0; z-index: -10 !important; background:none !important;}
.table-footer .pager {background-color: #fff !important;}
.table-footer .pager li *{color: #838a9d !important;}
.linkButton {float: right; padding-right: 10px; line-height: 40px;}
.main-table a {pointer-events: none; color: unset !important;}
.pager a {pointer-events: unset;}
.table-footer .pager li * {color: #838a9d !important;}
.table-responsive {margin-bottom: unset;}
.pager a {pointer-events: unset;}
.linkButton {float: right; padding-right: 10px; cursor: pointer;}
.linkButton i {font-size: 17px !important;}
.linkButton span {line-height: 40px; display: block;}
::-webkit-scrollbar {width: 10px; height: 10px;}
::-webkit-scrollbar-thumb:vertical {box-shadow: inset 1px 1px 0 rgb(0 0 0 / 10%), inset 0 -1px 0 rgb(0 0 0 / 7%); background-color: rgba(0, 0, 0, 0.2); border-radius: 10px; opacity: 0; transition: opacity 0.1s;}

28
module/execution/css/x.story.css
View File

@@ -1,28 +1,20 @@
#mainMenu {display: none;}
#sidebar {display: none;}
.table-footer>.table-statistic {display: none;}
.checkbox-primary {display: none !important;}
.c-sort, .c-category, .c-user, .c-estimate, .c-stage, .c-count, .c-actions-7, .c-actions {display: none;}
.dropdown {display: none;}
#xx-title {background-color: #F2F2F2; padding-left: 15px; line-height: 40px;}
body {margin-bottom: 0px !important;}
#main {min-width: unset; height: 427px; overflow-y: overlay;}
#main > .container {width: 100% !important;}
#mainContent > .main-col {margin-top: 0px;}
.pager > li > .pager-size-menu {display: none;}
.table-footer > .table-actions {display: none;}
#mainMenu, #sidebar, .dropdown, .c-sort, .c-category, .c-user, .c-estimate, .c-stage, .c-count, .c-actions-7, .c-actions, .table-footer > .table-statistic, .table-footer > .table-actions, .pager > li > .pager-size-menu {display: none;}
#storyList > thead > tr > .c-status, #storyList > thead > tr > .c-pri, #storyList > tbody > tr > .c-status, #storyList > tbody > tr > .c-pri {display: table-cell !important;}
.checkbox-primary, .table-footer .pager:before {display: none !important;}
#xx-title {background-color: #F2F2F2; padding-left: 15px; line-height: 40px;}
.main-col .table-responsive {height: 420px; margin-bottom: 0px;}
#storyList > thead > tr > .c-status {display: table-cell !important;}
#storyList > thead > tr > .c-pri {display: table-cell !important;}
#storyList > tbody > tr > .c-status {display: table-cell !important;}
#storyList > tbody > tr > .c-pri {display: table-cell !important;}
.table-footer{position: fixed !important; width: 100% !important; bottom: 0; z-index: -10 !important; background:none !important;}
.table-footer .pager:before {display: none !important;}
.main-table a {pointer-events: none;}
.table-footer {position: fixed !important; width: 100% !important; bottom: 0; z-index: -10 !important; background:none !important;}
.table-footer .pager {background-color: #fff !important;}
.table-footer .pager li *{color: #838a9d !important;}
.linkButton {float: right; padding-right: 10px; line-height: 40px;}
.main-table a {pointer-events: none; color: unset !important;}
.pager a {pointer-events: unset;}
.table-responsive {margin-bottom: unset;}
.pager a {pointer-events: unset;}
.linkButton {float: right; padding-right: 10px; cursor: pointer;}
.linkButton i {font-size: 17px !important;}
.linkButton span {line-height: 40px; display: block;}
::-webkit-scrollbar {width: 10px; height: 10px;}
::-webkit-scrollbar-thumb:vertical {box-shadow: inset 1px 1px 0 rgb(0 0 0 / 10%), inset 0 -1px 0 rgb(0 0 0 / 7%); background-color: rgba(0, 0, 0, 0.2); border-radius: 10px; opacity: 0; transition: opacity 0.1s;}

25
module/execution/css/x.task.css
View File

@@ -1,22 +1,19 @@
#mainMenu {display: none;}
#sidebar {display: none;}
.table-footer>.table-statistic {display: none;}
.checkbox-primary {display: none !important;}
.dropdown {display: none;}
#xx-title {background-color: #F2F2F2; padding-left: 15px; line-height: 40px;}
body {margin-bottom: 0px !important;}
td .task-toggle {pointer-events: auto !important;}
#mainMenu, #sidebar, .dropdown, .table-footer > .table-actions, .table-footer > .table-statistic, .pager > li > .pager-size-menu {display: none;}
#main {min-width: unset; height: 427px; overflow-y: overlay;}
#main > .container {width: 100% !important;}
#mainContent > .main-col {margin-top: 0px;}
.pager > li > .pager-size-menu {display: none;}
.table-footer > .table-actions {display: none;}
.table-footer{position: fixed !important; width: 100% !important; bottom: 0; z-index: -10 !important; background:none !important;}
.table-footer .pager:before {display: none !important;}
#xx-title {background-color: #F2F2F2; padding-left: 15px; line-height: 40px;}
.main-table a {pointer-events: none;}
.checkbox-primary, .table-footer .pager:before {display: none !important;}
.table-footer {position: fixed !important; width: 100% !important; bottom: 0; z-index: -10 !important; background:none !important;}
.table-footer .pager {background-color: #fff !important;}
.table-footer .pager li *{color: #838a9d !important;}
.linkButton {float: right; padding-right: 10px; line-height: 40px;}
.main-table a {pointer-events: none; color: unset !important;}
.pager a {pointer-events: unset;}
.table-footer .pager li * {color: #838a9d !important;}
.table-responsive {margin-bottom: unset;}
.pager a {pointer-events: unset;}
.linkButton {float: right; padding-right: 10px; cursor: pointer;}
.linkButton i {font-size: 17px !important;}
.linkButton span {line-height: 40px; display: block;}
::-webkit-scrollbar {width: 10px; height: 10px;}
::-webkit-scrollbar-thumb:vertical {box-shadow: inset 1px 1px 0 rgb(0 0 0 / 10%), inset 0 -1px 0 rgb(0 0 0 / 7%); background-color: rgba(0, 0, 0, 0.2); border-radius: 10px; opacity: 0; transition: opacity 0.1s;}

9
module/execution/view/bug.html.php
View File

@@ -34,7 +34,7 @@
<strong>
<?php echo ($this->project->getById($execution->project)->name . ' / ' . $this->execution->getByID($execution->id)->name) ?>
</strong>
<div class="linkButton" onclick="linkButtonClicked()">
<div class="linkButton" onclick="handleLinkButtonClick()">
<span title="<?php echo $lang->viewDetails;?>">
<i class="icon icon-import icon-rotate-270"></i>
</span>
@@ -206,11 +206,10 @@
<?php js::set('replaceID', 'bugList');?>
<?php js::set('browseType', $type);?>
<script>
function linkButtonClicked()
function handleLinkButtonClick()
{
$url = window.location.href;
$xxcUrl = "xxc:openInApp/zentao-integrated/" + encodeURIComponent($url.replace(/.display=card/, ''));
window.open($xxcUrl);
var xxcUrl = "xxc:openInApp/zentao-integrated/" + encodeURIComponent(window.location.href.replace(/.display=card/, '').replace(/\.xhtml/, '.html'));
window.open(xxcUrl);
}
</script>
<?php include '../../common/view/footer.html.php';?>

9
module/execution/view/story.html.php
View File

@@ -142,7 +142,7 @@
<strong>
<?php echo ($this->project->getById($execution->project)->name . ' / ' . $this->execution->getByID($execution->id)->name) ?>
</strong>
<div class="linkButton" onclick="linkButtonClicked()">
<div class="linkButton" onclick="handleLinkButtonClick()">
<span title="<?php echo $lang->viewDetails;?>">
<i class="icon icon-import icon-rotate-270"></i>
</span>
@@ -479,11 +479,10 @@ $(function()
}
});
});
function linkButtonClicked()
function handleLinkButtonClick()
{
$url = window.location.href;
$xxcUrl = "xxc:openInApp/zentao-integrated/" + encodeURIComponent($url.replace(/.display=card/, ''));
window.open($xxcUrl);
var xxcUrl = "xxc:openInApp/zentao-integrated/" + encodeURIComponent(window.location.href.replace(/.display=card/, '').replace(/\.xhtml/, '.html'));
window.open(xxcUrl);
}
</script>
<?php if(commonModel::isTutorialMode()): ?>

11
module/execution/view/task.html.php
View File

@@ -183,7 +183,7 @@ body {margin-bottom: 25px;}
<strong>
<?php echo ($this->project->getById($execution->project)->name . ' / ' . $this->execution->getByID($execution->id)->name) ?>
</strong>
<div class="linkButton" onclick="linkButtonClicked()">
<div class="linkButton" onclick="handleLinkButtonClick()">
<span title="<?php echo $lang->viewDetails;?>">
<i class="icon icon-import icon-rotate-270"></i>
</span>
@@ -283,7 +283,9 @@ body {margin-bottom: 25px;}
foreach($customFields as $field)
{
if($field->id == 'name' || $field->id == 'id' || $field->id == 'pri' || $field->id == 'status')
{
$this->task->printCell($field, $task, $users, $browseType, $branchGroups, $modulePairs, $useDatatable ? 'datatable' : 'table');
}
}?>
<?php else:?>
<?php foreach($customFields as $field) $this->task->printCell($field, $task, $users, $browseType, $branchGroups, $modulePairs, $useDatatable ? 'datatable' : 'table');?>
@@ -479,11 +481,10 @@ $(function()
}
})
});
function linkButtonClicked()
function handleLinkButtonClick()
{
$url = window.location.href;
$xxcUrl = "xxc:openInApp/zentao-integrated/" + encodeURIComponent($url.replace(/.display=card/, ''));
window.open($xxcUrl);
var xxcUrl = "xxc:openInApp/zentao-integrated/" + encodeURIComponent(window.location.href.replace(/.display=card/, '').replace(/\.xhtml/, '.html'));
window.open(xxcUrl);
}
</script>
<?php include '../../common/view/footer.html.php';?>