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

Merge branch 'sprint/272_tsj' into 'sprint/272'

Browse Source 
* Fixed positioning issues of guide block.

See merge request easycorp/zentaopms!6606
This commit is contained in:
孙广明
2022-12-21 02:45:41 +00:00
parent cb51799c85 7aff4d599e
commit c2ea44f0c7
5 changed files with 47 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/control.php
+5 -2
View File
@@ -426,7 +426,7 @@ class block extends control
}
elseif($block->block == 'guide')
{
$html = $this->fetch('block', 'guide');
$html = $this->fetch('block', 'guide', "blockID=$block->id");
}
elseif($block->block == 'assigntome')
{
@@ -2000,15 +2000,18 @@ class block extends control
/**
* Print guide block
*
* @param int $blockID
* @access public
* @return void
*/
public function guide()
public function guide($blockID = 0)
{
$this->app->loadLang('custom');
$this->app->loadLang('my');
$this->loadModel('setting');
$this->view->blockID = $blockID;
$this->view->programs = $this->loadModel('program')->getTopPairs('', 'noclosed', true);
$this->view->programID = isset($this->config->global->defaultProgram) ? $this->config->global->defaultProgram : 0;
$this->view->URSRList = $this->loadModel('custom')->getURSRPairs();
module/block/view/guide.html.php
+22 -18
View File
@@ -33,10 +33,14 @@
<?php endif;?>
</style>
<script>
<?php $blockNavId = 'nav-' . uniqid(); ?>
<?php $blockNavId = 'nav-' . $blockID; ?>
$(function()
{
var $nav = $('#<?php echo $blockNavId;?>');
var $block = $('#block<?php echo $blockID;?>');
var $nav = $block.find('#<?php echo $blockNavId;?>');
var visionPosition = "<?php echo 'visionPosition-' . $blockID;?>";
var themePosition = "<?php echo 'themePosition-' . $blockID;?>";
var systemModePosition = "<?php echo 'systemModePosition-' . $blockID;?>";
$nav.on('click', '.switch-icon', function(e)
{
var isPrev = $(this).is('.prev');
@@ -58,35 +62,35 @@ $(function()
$('.block-guide .tutorialBtn').addClass('hidden');
}
if($(this).attr('id') !== 'visionSwitch') removePosition('visionPosition');
if($(this).attr('id') !== 'themeSwitch') removePosition('themePosition');
if($(this).attr('id') !== 'systemModePosition') removePosition('systemModePosition');
if($(this).attr('id') !== 'visionSwitch') removePosition(visionPosition);
if($(this).attr('id') !== 'themeSwitch') removePosition(themePosition);
if($(this).attr('id') !== 'systemMode') removePosition(systemModePosition);
})
if(localStorage.getItem('visionPosition') && Number(localStorage.getItem('visionPosition')))
if(localStorage.getItem(visionPosition) && Number(localStorage.getItem(visionPosition)))
{
var scrollTopNum = Number(localStorage.getItem('visionPosition'));
document.getElementById('guideBody').scrollTo = scrollTopNum;
$('#visionSwitch > a').click();
var scrollTopNum = Number(localStorage.getItem(visionPosition));
$block.scrollTop('#guideBody', scrollTopNum);
$block.find('#visionSwitch > a').click();
window.scrollTo(0, scrollTopNum);
}
else if(localStorage.getItem('themePosition') && Number(localStorage.getItem('themePosition')))
else if(localStorage.getItem(themePosition) && Number(localStorage.getItem(themePosition)))
{
var scrollTopNum = Number(localStorage.getItem('themePosition'));
document.getElementById('guideBody').scrollTo = scrollTopNum;
$('#themeSwitch > a').click();
var scrollTopNum = Number(localStorage.getItem(themePosition));
$block.scrollTop('#guideBody', scrollTopNum);
$block.find('#themeSwitch > a').click();
window.scrollTo(0, scrollTopNum);
}
else if(localStorage.getItem('systemModePosition') && Number(localStorage.getItem('systemModePosition')))
else if(localStorage.getItem(systemModePosition) && Number(localStorage.getItem(systemModePosition)))
{
var scrollTopNum = Number(localStorage.getItem('systemModePosition'));
document.getElementById('guideBody').scrollTo = scrollTopNum;
$('#systemMode > a').click();
var scrollTopNum = Number(localStorage.getItem(systemModePosition));
$block.scrollTop('#guideBody', scrollTopNum);
$block.find('#systemMode > a').click();
window.scrollTo(0, scrollTopNum);
}
else
{
$('#flowchart > a').click();
$block.find('#flowchart > a').click();
}
/**
module/block/view/systemmodeswitch.html.php
+5 -7
View File
@@ -64,9 +64,6 @@ $(function()
*/
function switchMode()
{
parent.location.reload();
return;
if(selectedMode == usedMode) return;
var postData = {mode: selectedMode};
@@ -77,14 +74,15 @@ $(function()
});
}
var $nav = $('#<?php echo "tab3{$blockNavId}ContentsystemMode";?>');
$nav.on('click', '.mode-block', function()
var $block = $('#block<?php echo $blockID;?>');
var systemModePosition = "<?php echo 'systemModePosition-' . $blockID;?>";
$block.on('click', '.mode-block', function()
{
selectedMode = $(this).data('mode');
if(selectedMode == usedMode) return;
var scrollTop = document.documentElement.scrollTop || window.pageYOffset || document.body.scrollTop || $('#guideBody').offset().top;
localStorage.setItem('systemModePosition', scrollTop);
var scrollTop = document.documentElement.scrollTop || window.pageYOffset || document.body.scrollTop || $block.find('#guideBody').offset().top;
localStorage.setItem(systemModePosition, scrollTop);
if(selectedMode == 'light' && hasProgram)
{
module/block/view/themeswitch.html.php
+9 -4
View File
@@ -13,12 +13,17 @@
.theme-text .icon {padding-right: 10px;}
</style>
<script>
$('.themeSwitch > .theme').click(function()
$(function()
{
var scrollTop = document.documentElement.scrollTop || window.pageYOffset || document.body.scrollTop || $('#guideBody').offset().top;
localStorage.setItem('themePosition', scrollTop);
var $block = $('#block<?php echo $blockID;?>');
var themePosition = "<?php echo 'themePosition-' . $blockID;?>";
$block.find('.themeSwitch > .theme').click(function()
{
var scrollTop = document.documentElement.scrollTop || window.pageYOffset || document.body.scrollTop || $block.find('#guideBody').offset().top;
localStorage.setItem(themePosition, scrollTop);
selectTheme($(this).attr('data-value'));
selectTheme($(this).attr('data-value'));
});
})
</script>
<div class='themeSwitch'>
module/block/view/visionswitch.html.php
+6 -4
View File
@@ -28,7 +28,9 @@
<script>
$(function()
{
$('.vision-switch .vision').click(function(e)
var $block = $('#block<?php echo $blockID;?>');
var visionPosition = "<?php echo 'visionPosition-' . $blockID;?>";
$block.find('.vision-switch .vision').click(function(e)
{
var selectedVision = $(this).data('value');
if (vision == selectedVision)
@@ -37,8 +39,8 @@ $(function()
return false;
}
var scrollTop = document.documentElement.scrollTop || window.pageYOffset || document.body.scrollTop || $('#guideBody').offset().top;
localStorage.setItem('visionPosition', scrollTop);
})
var scrollTop = document.documentElement.scrollTop || window.pageYOffset || document.body.scrollTop || $block.find('#guideBody').offset().top;
localStorage.setItem(visionPosition, scrollTop);
});
})
</script>