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

Merge branch 'sprint/168_chaideqing_44636' into 'sprint/168'

Browse Source 
modify zentao bug/task/story card page's srollbar and actionbar

See merge request easycorp/zentaopms!604
This commit is contained in:
朱金勇
2021-11-24 05:01:16 +00:00
parent 052157902a 45556985f7
commit 40e772acea
10 changed files with 48 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/css/x.view.css
+3 -5
View File
@@ -6,13 +6,11 @@
#mainContent .col-4 {display: none;}
.modal-dialog {width: 90%;}
#mainMenu {position: fixed; width: 100%; z-index: 999;}
#wholeContent {margin-top: 35px; height: calc(100% - 90px); display: block; overflow: hidden;}
#wholeContent:hover{overflow: overlay;}
#scrollContent {margin-top: 35px; height: calc(100% - 70px); display: block; overflow: hidden;}
#scrollContent:hover{overflow: overlay;}
html, body, #main, .container { height: 100%;}
#actionbox {display: none;}
body * {font-size: 13px !important; line-height: 1.42857143; color: rgb(51, 51, 51);}
.page-title > .label-id {min-width: 25px; line-height: 13px;}
::-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;}
.m-bug-view:hover{overflow: overlay;}
.m-bug-view{overflow: hidden;}
.btn span{line-height: 16px; vertical-align: middle;}
module/bug/js/x.view.js
+9 -3
View File
@@ -28,8 +28,14 @@ $(function()
xuanAction += "<a href='" + url + "'" + title + target + btnClass + '>' + action + "</a>";
});
xuanAction += '</div>';
$('body').append(xuanAction);
if(xuanAction != "<div class='xuancard-actions fixed'>")
{
xuanAction += '</div>';
$('body').append(xuanAction);
}
else
{
$('#scrollContent').css('height', 'calc(100% - 36px)');
}
$('.xuancard-actions a.iframe').modalTrigger();
})
module/bug/view/view.html.php
+4 -2
View File
@@ -38,7 +38,7 @@
<?php endif;?>
</div>
<?php if($this->app->getViewType() == 'xhtml'):?>
<div id="wholeContent">
<div id="scrollContent">
<?php endif;?>
<div id="mainContent" class="main-row">
<div class="main-col col-8">
@@ -68,7 +68,9 @@
?>
</div>
<?php $this->printExtendFields($bug, 'div', "position=left&inForm=0&inCell=1");?>
<div class='cell'><?php include '../../common/view/action.html.php';?></div>
<?php if($this->app->getViewType() != 'xhtml'):?>
<div class="cell"><?php include '../../common/view/action.html.php';?></div>
<?php endif;?>
<?php
$params = "bugID=$bug->id";
$extraParams = "extras=bugID=$bug->id";
module/story/css/x.view.css
+3 -3
View File
@@ -7,11 +7,11 @@
.col-8>.cell {min-height: 300px;}
.modal-dialog {width: 90%;}
#mainMenu {position: fixed; width: 100%; z-index: 999;}
#wholeContent {margin-top: 35px; height: calc(100% - 90px); display: block; overflow: hidden;}
#wholeContent:hover{overflow: overlay;}
#scrollContent {margin-top: 35px; height: calc(100% - 70px); display: block; overflow: hidden;}
#scrollContent:hover{overflow: overlay;}
html, body, #main, .container { height: 100%;}
#actionbox {display: none;}
body * {font-size: 13px !important; line-height: 1.42857143; color: rgb(51, 51, 51);}
.page-title > .label-id {min-width: 25px; line-height: 13px;}
::-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;}
.btn span{line-height: 16px; vertical-align: middle;}
module/story/js/x.view.js
+9 -2
View File
@@ -29,7 +29,14 @@ $(function()
xuanAction += "<a href='" + url + "'" + title + target + btnClass + '>' + action + "</a>";
});
xuanAction += '</div>';
$('body').append(xuanAction);
if(xuanAction != "<div class='xuancard-actions fixed'>")
{
xuanAction += '</div>';
$('body').append(xuanAction);
}
else
{
$('#scrollContent').css('height', 'calc(100% - 36px)');
}
$('.xuancard-actions a.iframe').modalTrigger();
})
module/story/view/view.html.php
+3 -1
View File
@@ -63,7 +63,7 @@
<?php endif;?>
</div>
<?php if($this->app->getViewType() == 'xhtml'):?>
<div id="wholeContent">
<div id="scrollContent">
<?php endif;?>
<div id="mainContent" class="main-row">
<div class="main-col col-8">
@@ -184,7 +184,9 @@
<?php endif;?>
</div>
<?php $this->printExtendFields($story, 'div', "position=left&inForm=0&inCell=1");?>
<?php if($this->app->getViewType() != 'xhtml'):?>
<div class="cell"><?php include '../../common/view/action.html.php';?></div>
<?php endif;?>
<div class='main-actions'>
<div class="btn-toolbar">
<?php common::printBack($browseLink);?>
module/task/css/x.view.css
+3 -5
View File
@@ -7,13 +7,11 @@
.col-8 > .cell {min-height: 300px;}
.modal-dialog {width: 90%;}
#mainMenu {position: fixed; width: 100%; z-index: 999;}
#wholeContent {margin-top: 35px; height: calc(100% - 90px); display: block; overflow: hidden;}
#wholeContent:hover{overflow: overlay;}
#scrollContent {margin-top: 35px; height: calc(100% - 70px); display: block; overflow: hidden;}
#scrollContent:hover{overflow: overlay;}
html, body, #main, .container { height: 100%;}
#actionbox {display: none;}
body * {font-size: 13px !important; line-height: 1.42857143; color: rgb(51, 51, 51);}
.page-title > .label-id {min-width: 25px; line-height: 13px;}
::-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;}
.m-task-view:hover{overflow: overlay;}
.m-task-view{overflow: hidden;}
.btn span{line-height: 16px; vertical-align: middle;}
module/task/js/x.view.js
+9 -2
View File
@@ -28,7 +28,14 @@ $(function()
xuanAction += "<a href='" + url + "'" + title + target + btnClass + '>' + action + "</a>";
});
xuanAction += '</div>';
$('body').append(xuanAction);
if(xuanAction != "<div class='xuancard-actions fixed'>")
{
xuanAction += '</div>';
$('body').append(xuanAction);
}
else
{
$('#scrollContent').css('height', 'calc(100% - 36px)');
}
$('.xuancard-actions a.iframe').modalTrigger();
})
module/task/view/view.html.php
+3 -1
View File
@@ -47,7 +47,7 @@
<?php endif;?>
</div>
<?php if($this->app->getViewType() == 'xhtml'):?>
<div id="wholeContent">
<div id="scrollContent">
<?php endif;?>
<div id="mainContent" class="main-row">
<div class="main-col col-8">
@@ -153,7 +153,9 @@
?>
</div>
<?php $this->printExtendFields($task, 'div', "position=left&inForm=0&inCell=1");?>
<?php if($this->app->getViewType() != 'xhtml'):?>
<div class="cell"><?php include '../../common/view/action.html.php';?></div>
<?php endif;?>
<div class='main-actions'>
<div class="btn-toolbar">
<?php common::printBack($browseLink);?>
www/theme/default/x.style.css
+2 -2
View File
@@ -8,5 +8,5 @@ body{padding:0px; margin: 0px;background-color: #fff;}
#mainContent .cell{box-shadow:none; -webkit-box-shadow: none;}
.xuanxuan-card{padding-bottom:55px;}
.xuancard-actions{width: 100%;text-align: center; padding: 10px 0;}
.xuancard-actions.fixed{position: fixed; background: #fff; border-top: 1px solid #ddd; bottom: 0; margin-bottom: 0; z-index: 999; box-shadow: 0 -2px 10px rgba(0,0,0,0.15);}
.xuancard-actions{width: 100%;text-align: center; height: 34px;}
.xuancard-actions.fixed{position: fixed; background: #fff; border-top: 1px solid #ddd; bottom: 0; margin-bottom: 0; z-index: 999;}