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
module/task/css/x.view.css
+11 -13
View File
@@ -1,21 +1,19 @@
#mainMenu .pull-left > a {display: none;}
#mainMenu .pull-left .divider {display: none;}
#mainMenu .pull-right {display: none;}
#mainContent .col-4 {display: none;}
body * {font-size: 13px !important; line-height: 1.42857143; color: rgb(51, 51, 51);}
#main {margin-bottom: 40px; min-width: unset;}
.main-actions {display: none;}
.col-8 > .cell {min-height: 300px;}
.modal-dialog {width: 90%;}
#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;}
#scrollContent:hover{overflow: overlay;}
#scrollContent:hover {overflow: overlay;}
html, body, #main, .container { height: 100%;}
body * {font-size: 13px !important; line-height: 1.42857143; color: rgb(51, 51, 51);}
.page-title {width: 100%;}
.btn span {line-height: 16px; vertical-align: middle;}
.col-8 > .cell {min-height: 300px;}
.modal-dialog {width: 90%;}
.page-title > .label-id {min-width: 25px; line-height: 13px;}
.page-title {width: 100%;}
.page-title > .text {display: inline-block; width: calc(100% - 80px); text-overflow: ellipsis; white-space: nowrap; overflow: hidden; line-height: 13px;}
.linkButton {float: right; padding-right: 10px; cursor: pointer;}
.linkButton i {font-size: 17px !important;}
.linkButton span {line-height: 34px; display: block;}
.btn-toolbar {width: calc(100% - 30px);}
::-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;}
.linkButton {float: right; padding-right: 10px; line-height: 34px;}
.btn-toolbar {width: calc(100% - 30px);}
module/task/js/x.view.js
+1 -1
View File
@@ -31,7 +31,7 @@ $(function()
if(xuanAction != "<div class='xuancard-actions fixed'>")
{
var params = window.location.search;
if(params.indexOf('displayNotice=card') == -1)
if(params.indexOf('isNotice=1') == -1)
{
xuanAction += '</div>';
$('body').append(xuanAction);
module/task/view/view.html.php
+5 -6
View File
@@ -14,10 +14,10 @@
<?php include '../../common/view/kindeditor.html.php';?>
<?php $browseLink = $app->session->taskList != false ? $app->session->taskList : $this->createLink('execution', 'browse', "executionID=$task->execution");?>
<?php js::set('sysurl', common::getSysUrl());?>
<?php if(strpos($_SERVER["QUERY_STRING"], 'displayNotice=card') === false):?>
<?php if(strpos($_SERVER["QUERY_STRING"], 'isNotice=1') === false):?>
<div id="mainMenu" class="clearfix">
<?php if($this->app->getViewType() == 'xhtml'):?>
<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>
@@ -408,11 +408,10 @@
<?php common::printPreAndNext($preAndNext);?>
</div>
<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/syntaxhighlighter.html.php';?>