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

* bug #14738, fix tootip not show as expected in menu nav.

Browse Source
This commit is contained in:
Hao Sun
2021-09-08 13:19:53 +08:00
parent 5ae8a3ff2d
commit cc1e8a8b32
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/index/view/index.html.php
+7
View File
@@ -30,6 +30,13 @@ js::set('manualUrl', ((!empty($config->isINT)) ? $config->manualUrl['int'] :
#upgradeContent {top: -272px; height: 262px;}
#latestVersionList {height: 200px;}
<?php endif;?>
<?php if(commonModel::isTutorialMode()):?>
#menuMoreNav > li.dropdown:hover + .tooltip {display: none!important;}
#menuMoreList > li.active {position: relative;}
#menuMoreList > li.active:before {content: ' '; display: block; position: absolute; left: 100%; border-width: 5px 5px 5px 0; border-style: solid; border-color: transparent; border-right-color: #ff9800; width: 0; height: 0; top: 12px}
#menuMoreList > li.active:after {content: attr(data-tip); display: block; position: absolute; left: 100%; background-color: #f1a325; color: #fff; top: 3px; white-space: nowrap; line-height: 16px; padding: 8px 10px; margin-left: 5px; border-radius: 4px;}
<?php endif;?>
</style>
<div id='menu'>
<nav id='menuNav'>
module/tutorial/js/index.js
+15 -7
View File
@@ -81,8 +81,7 @@ $(function()
var clearTips = function()
{
appsWindow.$('#menuMainNav > li.hl-tutorial').removeClass('hl-tutorial hl-in').tooltip('destroy');
var $menuMainNav = appsWindow.$('#menuMainNav');
var $menuMainNav = appsWindow.$('#menuNav');
$menuMainNav.find('.hl-tutorial').removeClass('hl-tutorial hl-in');
$menuMainNav.find('.tooltip-tutorial').tooltip('destroy').removeClass('tooltip-tutorial');
var appWindow = getAppWindow();
@@ -178,16 +177,25 @@ $(function()
html: true
}, options);
$e = $e.first();
if($e.css('display') == 'none')
{
$e.parent().addClass('tooltip-tutorial').after("<div id='typeLabel' class='text-danger help-text'>" + options.title + "</div>");
}
else
if($e.css('display') !== 'none')
{
if(!$e.data('zui.tooltip')) $e.addClass('tooltip-tutorial').attr('data-toggle', 'tooltip').tooltip(options);
$e.tooltip('show');
if($e[0].getBoundingClientRect().top > $(window).height() || $e[0].getBoundingClientRect().top < 0) $e[0].scrollIntoView();
}
else if($e.parent().is('#menuMainNav'))
{
var $menuMoreItem = appsWindow.$('#menuMoreNav>li.dropdown');
highlight($menuMoreItem);
showToolTip($menuMoreItem, text, $.extend({}, options, {tipClass: 'tooltip-warning tooltip-max tooltip-menu-more text-nowrap', container: false}));
var appCode = $e.data('app');
appsWindow.$('#menuMoreList>li').removeClass('active').attr('data-tip', '');
appsWindow.$('#menuMoreList>li[data-app="' + appCode + '"]').addClass('active hl-tutorial hl-in').attr('data-tip', text);
}
else
{
$e.parent().addClass('tooltip-tutorial').after("<div id='typeLabel' class='text-danger help-text'>" + options.title + "</div>");
}
};
var tryCheckTask = function()