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

Merge branch 'sprint/xuan_106' into 'master'

Browse Source 
Sprint/xuan 106

See merge request easycorp/zentaopms!4126
This commit is contained in:
王怡栋
2022-06-24 01:35:58 +00:00
parent f2603f143d 7963845b6b
commit 8ad9dea460
5 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/view/header.lite.html.php
+8 -8
View File
@@ -1,5 +1,5 @@
<?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
<?php
if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}
$clientLang = $app->getClientLang();
$webRoot = $this->app->getWebRoot();
$jsRoot = $webRoot . "js/";
@@ -81,13 +81,13 @@ $xuanExtFile = $extensionRoot . 'xuan/common/ext/view/header.xuanxuan.html.hook.
if(file_exists($xuanExtFile)) include $xuanExtFile;
?>
</head>
<?php $singleClass = $this->app->getViewType() == 'xhtml' ? 'allow-self-open' : '';?>
<?php if(isset($pageBodyClass)) $singleClass = $singleClass . ' ' . $pageBodyClass; ?>
<?php if($this->moduleName == 'index' && $this->methodName == 'index'): ?>
<body class='menu-<?php echo $this->cookie->hideMenu ? 'hide' : 'show'; ?> <?php echo $singleClass;?>'>
<?php else: ?>
<body class='<?php echo $singleClass;?>'>
<?php endif; ?>
<?php
$bodyClass = $this->app->getViewType() == 'xhtml' ? 'allow-self-open' : '';
if(isset($pageBodyClass)) $bodyClass = $bodyClass . ' ' . $pageBodyClass;
if($this->moduleName == 'index' && $this->methodName == 'index') $bodyClass .= ' menu-' . ($this->cookie->hideMenu ? 'hide' : 'show');
if(strpos($_SERVER['HTTP_USER_AGENT'], 'xuanxuan') !== false) $bodyClass .= ' xxc-embed';
?>
<body class='<?php echo $bodyClass; ?>'>
<?php if($this->app->getViewType() == 'xhtml'):?>
<style>
.main-actions-holder {display: none !important;}
module/index/view/index.html.php
+2
View File
@@ -45,6 +45,7 @@ js::set('showFeatures', $showFeatures);
#searchbox .dropdown-menu.show-quick-go.with-active {min-height: 180px;}
<?php endif;?>
</style>
<?php if(strpos($_SERVER['HTTP_USER_AGENT'], 'xuanxuan') === false):?>
<div id='menu'>
<nav id='menuNav'>
<ul class='nav nav-default' id='menuMainNav'>
@@ -77,6 +78,7 @@ js::set('showFeatures', $showFeatures);
</ul>
</div>
</div>
<?php endif;?>
<div id='apps'>
</div>
<div id='appsBar'>
www/js/my.full.js
+1 -1
View File
@@ -210,7 +210,7 @@ function setImageSize(image, maxWidth, maxHeight)
setTimeout(function()
{
maxHeightStyle = $image.height() > 0 ? 'max-height:' + maxHeight + 'px' : '';
if($image.width() > 0 && $image.width() > maxWidth) $image.attr('width', maxWidth);
if(!document.getElementsByClassName('xxc-embed').length && $image.width() > 0 && $image.width() > maxWidth) $image.attr('width', maxWidth);
$image.wrap('<a href="' + $image.attr('src') + '" style="display:inline-block;position:relative;overflow:hidden;' + maxHeightStyle + '" target="_blank"></a>');
if($image.height() > 0 && $image.height() > maxHeight) $image.closest('a').append("<a href='###' class='showMoreImage' onclick='showMoreImage(this)'>" + lang.expand + " <i class='icon-angle-down'></i></a>");
}, 50);
www/theme/default/x.style.css
+5
View File
@@ -10,3 +10,8 @@ body{padding:0px; margin: 0px;background-color: #fff;}
.xuanxuan-card{padding-bottom:55px;}
.xuancard-actions{width: 100%;text-align: center; height: 35px; padding: 1px;}
.xuancard-actions.fixed{position: fixed; background: #fff; border-top: 1px solid #eee; bottom: 0; margin-bottom: 0; z-index: 999;}
body.xxc-embed {overflow-x: auto; overflow-y: hidden;}
.xxc-embed #header {position: fixed;top: 0;width: 100%;z-index: 10;}
.xxc-embed #toolbar {position: fixed;right: 120px!important;}
.xxc-embed #main {position: absolute;top: 50px;bottom: 0;left: 0;right: 0;overflow: auto;}
.xxc-embed .fix-table-copy-wrapper {top: 50px!important;}
xuanxuan/extension/xuan/index/ext/view/index.xuanxuan.html.hook.php
+1 -3
View File
@@ -1,8 +1,6 @@
<?php if(strpos($_SERVER['HTTP_USER_AGENT'], 'xuanxuan') != false): ?>
<style>
#menu {display: none!important;}
#appsBar,
#apps {left: 0!important;}
#appsBar, #apps {left: 0!important;}
</style>
<script>
$('html').addClass('xxc-embed');