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

2
extension/lite/product/ext/view/browse.html.php
View File

@@ -591,7 +591,7 @@ function setBadgeStyle(obj, isShow)
function handleLinkButtonClick() 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); window.open(xxcUrl);
} }
</script> </script>

2
extension/lite/story/ext/view/view.html.php
View File

@@ -346,7 +346,7 @@ js::set('rawModule', $this->app->rawModule);
<script> <script>
function handleLinkButtonClick() 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); window.open(xxcUrl);
} }
</script> </script>

2
module/bug/css/x.browse.css
View File

@@ -1,6 +1,6 @@
body {margin-bottom: 0px !important;} body {margin-bottom: 0px !important;}
#mainMenu, #sidebar, .dropdown, .pager > li > .pager-size-menu, .table-footer > .table-actions, .table-footer>.table-statistic {display: none;} #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;} #main > .container {width: 100% !important;}
#mainContent > .main-col {margin-top: 0px;} #mainContent > .main-col {margin-top: 0px;}
#xx-title {background-color: #F2F2F2; padding-left: 15px; line-height: 40px;} #xx-title {background-color: #F2F2F2; padding-left: 15px; line-height: 40px;}

2
module/bug/css/x.view.css
View File

@@ -1,5 +1,5 @@
body * {font-size: 13px !important; line-height: 1.42857143; color: rgb(51, 51, 51);} 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 .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;} #mainMenu {position: fixed; width: 100%; z-index: 999;}
#scrollContent {margin-top: 35px; height: calc(100% - 70px); display: block; overflow: hidden;} #scrollContent {margin-top: 35px; height: calc(100% - 70px); display: block; overflow: hidden;}

2
module/bug/view/browse.html.php
View File

@@ -462,7 +462,7 @@ $('#bugForm .table-footer .table-actions #assignedTo').closest('.btn-group.dropu
<?php endif;?> <?php endif;?>
function handleLinkButtonClick() 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); window.open(xxcUrl);
} }
</script> </script>

2
module/bug/view/view.html.php
View File

@@ -468,7 +468,7 @@
<script> <script>
function handleLinkButtonClick() 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); window.open(xxcUrl);
} }
</script> </script>

2
module/doc/css/x.view.css
View File

@@ -1,4 +1,4 @@
.side-col.col-4 {display: none;} .side-col.col-4 {display: none; position: unset !important;}
#main {margin-bottom: 40px;} #main {margin-bottom: 40px;}
#mainMenu {margin-top: 0px;} #mainMenu {margin-top: 0px;}
#mainMenu .btn {display: none;} #mainMenu .btn {display: none;}

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

@@ -1,5 +1,5 @@
body {margin-bottom: 0px !important;} body {margin-bottom: 0px !important;}
#main {min-width: unset; overflow-y: overlay;} #main {min-width: unset; overflow-y: overlay; position: unset !important;}
#main > .container {width: 100% !important;} #main > .container {width: 100% !important;}
#mainContent > .main-col {margin-top: 0px;} #mainContent > .main-col {margin-top: 0px;}
#mainMenu, #sidebar, .dropdown, .table-footer > .table-actions, .table-footer>.table-statistic, .pager > li > .pager-size-menu {display: none;} #mainMenu, #sidebar, .dropdown, .table-footer > .table-actions, .table-footer>.table-statistic, .pager > li > .pager-size-menu {display: none;}

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

@@ -1,6 +1,6 @@
body {margin-bottom: 0px !important;} body {margin-bottom: 0px !important;}
#main {min-width: unset; overflow-y: overlay;} #main {min-width: unset; overflow-y: overlay;}
#main > .container {width: 100% !important;} #main > .container {width: 100% !important; position: unset !important;}
#mainContent > .main-col {margin-top: 0px;} #mainContent > .main-col {margin-top: 0px;}
#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;} #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;} #storyList > thead > tr > .c-status, #storyList > thead > tr > .c-pri, #storyList > tbody > tr > .c-status, #storyList > tbody > tr > .c-pri {display: table-cell !important;}

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

@@ -1,7 +1,7 @@
body {margin-bottom: 0px !important;} body {margin-bottom: 0px !important;}
td .task-toggle {pointer-events: auto !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;} #mainMenu, #sidebar, .dropdown, .table-footer > .table-actions, .table-footer > .table-statistic, .pager > li > .pager-size-menu {display: none;}
#main {min-width: unset; overflow-y: overlay;} #main {min-width: unset; overflow-y: overlay; position: unset !important;}
#main > .container {width: 100% !important;} #main > .container {width: 100% !important;}
#mainContent > .main-col {margin-top: 0px;} #mainContent > .main-col {margin-top: 0px;}
#xx-title {background-color: #F2F2F2; padding-left: 15px; line-height: 36px;} #xx-title {background-color: #F2F2F2; padding-left: 15px; line-height: 36px;}

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

@@ -210,7 +210,7 @@ $(function(){$('#executionBugForm').table();})
<?php endif;?> <?php endif;?>
function handleLinkButtonClick() 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); window.open(xxcUrl);
} }
</script> </script>

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

@@ -400,7 +400,7 @@ $(function()
}); });
function handleLinkButtonClick() 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); window.open(xxcUrl);
} }
<?php if(!empty($useDatatable)):?> <?php if(!empty($useDatatable)):?>

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

@@ -477,7 +477,7 @@ $(function()
<?php if($this->app->getViewType() == 'xhtml'):?> <?php if($this->app->getViewType() == 'xhtml'):?>
function handleLinkButtonClick() 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); window.open(xxcUrl);
} }

2
module/product/css/x.browse.css
View File

@@ -1,7 +1,7 @@
body {margin-bottom: 0px !important;} body {margin-bottom: 0px !important;}
td .story-toggle {pointer-events: auto !important;} td .story-toggle {pointer-events: auto !important;}
#mainMenu, #sidebar, .table-footer > .table-actions, .dropdown, .table-footer>.table-statistic, .pager > li > .pager-size-menu {display: none;} #mainMenu, #sidebar, .table-footer > .table-actions, .dropdown, .table-footer>.table-statistic, .pager > li > .pager-size-menu {display: none;}
#main {min-width: unset; overflow-y: overlay;} #main {min-width: unset; overflow-y: overlay; position: unset !important;}
#main > .container {width: 100% !important;} #main > .container {width: 100% !important;}
#mainContent > .main-col {margin-top: 0px;} #mainContent > .main-col {margin-top: 0px;}
#xx-title {background-color: #F2F2F2; padding-left: 15px; line-height: 40px;} #xx-title {background-color: #F2F2F2; padding-left: 15px; line-height: 40px;}

2
module/product/view/browse.html.php
View File

@@ -749,7 +749,7 @@ function setBadgeStyle(obj, isShow)
function handleLinkButtonClick() 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); window.open(xxcUrl);
} }
</script> </script>

4
module/productplan/css/x.view.css
View File

@@ -1,6 +1,6 @@
#mainMenu, .actions, .pager-size-menu, .tab-btn-container ul li span {display: none;} #mainMenu, .actions, .pager-size-menu, .tab-btn-container ul li span {display: none;}
#main {min-width: unset; overflow-y: overlay;} #main {min-width: unset; overflow-y: overlay; position: unset !important;}
.main-content {padding: 0; } .main-content {padding: 0;}
.main-table {margin-bottom: 40px;} .main-table {margin-bottom: 40px;}
.main-content, .main-table > .table, .main-table > .table-footer, .main-table > .table-header, .main-table > .table-responsive {box-shadow: none!important;} .main-content, .main-table > .table, .main-table > .table-footer, .main-table > .table-header, .main-table > .table-responsive {box-shadow: none!important;}
.table-footer {position: fixed; width: 100%; bottom: 0;} .table-footer {position: fixed; width: 100%; bottom: 0;}

2
module/productplan/view/view.html.php
View File

@@ -609,7 +609,7 @@
<script> <script>
function handleLinkButtonClick() 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, '_blank'); window.open(xxcUrl, '_blank');
} }

2
module/story/css/x.view.css
View File

@@ -1,5 +1,5 @@
body * {font-size: 13px !important; line-height: 1.42857143; color: rgb(51, 51, 51);} 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 {position: fixed; width: 100%; z-index: 999;} #mainMenu {position: fixed; width: 100%; z-index: 999;}
#mainMenu .pull-left>a, #mainMenu .pull-left .divider, #mainMenu .pull-right, #mainContent .col-4, .main-actions {display: none;} #mainMenu .pull-left>a, #mainMenu .pull-left .divider, #mainMenu .pull-right, #mainContent .col-4, .main-actions {display: none;}
#scrollContent {margin-top: 35px; height: calc(100% - 70px); display: block; overflow: hidden;} #scrollContent {margin-top: 35px; height: calc(100% - 70px); display: block; overflow: hidden;}

2
module/story/view/view.html.php
View File

@@ -579,7 +579,7 @@ js::set('rawModule', $this->app->rawModule);
<script> <script>
function handleLinkButtonClick() 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); window.open(xxcUrl);
} }
</script> </script>

2
module/task/css/x.view.css
View File

@@ -1,5 +1,5 @@
body * {font-size: 13px !important; line-height: 1.42857143; color: rgb(51, 51, 51);} 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 .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;} #mainMenu {position: fixed; width: 100%; z-index: 999;}
#scrollContent {margin-top: 35px; height: calc(100% - 70px); display: block; overflow: hidden;} #scrollContent {margin-top: 35px; height: calc(100% - 70px); display: block; overflow: hidden;}

2
module/task/view/view.html.php
View File

@@ -442,7 +442,7 @@
<script> <script>
function handleLinkButtonClick() 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); window.open(xxcUrl);
} }
</script> </script>

2
module/testcase/css/x.view.css
View File

@@ -1,5 +1,5 @@
.side-col.col-4 {display: none;} .side-col.col-4 {display: none;}
#main {margin-bottom: 40px;} #main {margin-bottom: 40px; position: unset !important;}
#mainMenu {margin-top: 0px;} #mainMenu {margin-top: 0px;}
#mainMenu .btn {display: none;} #mainMenu .btn {display: none;}
#mainMenu .divider {display: none;} #mainMenu .divider {display: none;}