From 0774bce6efd948839b51909253f74482912f153b Mon Sep 17 00:00:00 2001
From: dingyongliang <dingyongliang@easycorp.ltd>
Date: Fri, 17 Jun 2022 09:12:44 +0000
Subject: [PATCH] * electron/zentao: merge navigation bar and control bar.

---
 module/common/view/header.html.php      |  7 +++++++
 module/common/view/header.lite.html.php | 18 +++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/module/common/view/header.html.php b/module/common/view/header.html.php
index e294df8a85..81b7867dcf 100755
--- a/module/common/view/header.html.php
+++ b/module/common/view/header.html.php
@@ -7,6 +7,13 @@ include 'chosen.html.php';
 <?php if(empty($_GET['onlybody']) or $_GET['onlybody'] != 'yes'):?>
 <?php $this->app->loadConfig('sso');?>
 <?php if(!empty($config->sso->redirect)) js::set('ssoRedirect', $config->sso->redirect);?>
+<style>
+    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;}
+</style>
 <header id='header'>
   <div id='mainHeader'>
     <div class='container'>
diff --git a/module/common/view/header.lite.html.php b/module/common/view/header.lite.html.php
index b0e795ee68..11b7a4003b 100755
--- a/module/common/view/header.lite.html.php
+++ b/module/common/view/header.lite.html.php
@@ -1,5 +1,5 @@
-<?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
-<?php
+<?php 
+if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}
 $clientLang   = $app->getClientLang();
 $webRoot      = $this->app->getWebRoot();
 $jsRoot       = $webRoot . "js/";
@@ -80,13 +80,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;}
