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

Merge branch 'sprint/xuanxuan_110' into 'master'

Browse Source 
Sprint/xuanxuan 110

See merge request easycorp/zentaopms!4563
This commit is contained in:
王怡栋
2022-07-15 03:17:39 +00:00
parent e399056cee 69f20c1205
commit 7e682c99c2
22 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/css/x.browse.css
+1 -1
View File
@@ -1,6 +1,6 @@
body {margin-bottom: 0px !important;}
#mainMenu, #sidebar, .dropdown, .pager > li > .pager-size-menu, .table-footer > .table-actions, .table-footer>.table-statistic {display: none;}
#main {min-width: unset; overflow-y: overlay;}
#main {min-width: unset; overflow-y: overlay; position: unset !important;}
#main > .container {width: 100% !important;}
#mainContent > .main-col {margin-top: 0px;}
#xx-title {background-color: #F2F2F2; padding-left: 15px; line-height: 40px;}
module/bug/css/x.view.css
+1 -1
View File
@@ -1,5 +1,5 @@
body * {font-size: 13px !important; line-height: 1.42857143; color: rgb(51, 51, 51);}
#main {margin-bottom: 40px; min-width: unset;}
#main {margin-bottom: 40px; min-width: unset; position: unset !important;}
#mainMenu .pull-left>a, #mainMenu .pull-left .divider, #mainMenu .pull-right, #mainContent .col-4, .main-actions {display: none;}
#mainMenu {position: fixed; width: 100%; z-index: 999;}
#scrollContent {margin-top: 35px; height: calc(100% - 70px); display: block; overflow: hidden;}
module/bug/view/browse.html.php
+1 -1
View File
@@ -462,7 +462,7 @@ $('#bugForm .table-footer .table-actions #assignedTo').closest('.btn-group.dropu
<?php endif;?>
function handleLinkButtonClick()
{
var xxcUrl = "xxc:openInApp/zentao-integrated/" + encodeURIComponent(window.location.href.replace(/.display=card/, '').replace(/\.xhtml/, '.html'));
var xxcUrl = "xxc:openInApp/zentao-integrated/" + encodeURIComponent(window.location.href.replace(/.display=card/, '').replace('xhtml', 'html'));
window.open(xxcUrl);
}
</script>
module/bug/view/view.html.php
+1 -1
View File
@@ -468,7 +468,7 @@
<script>
function handleLinkButtonClick()
{
var xxcUrl = "xxc:openInApp/zentao-integrated/" + encodeURIComponent(window.location.href.replace(/.display=card/, '').replace(/\.xhtml/, '.html'));
var xxcUrl = "xxc:openInApp/zentao-integrated/" + encodeURIComponent(window.location.href.replace(/.display=card/, '').replace('xhtml', 'html'));
window.open(xxcUrl);
}
</script>