Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

This commit is contained in:
hufangzhou
2021-05-24 17:02:48 +08:00
+12 -12
View File
@@ -178,18 +178,6 @@
}
}
/* Set openApp cookie */
$.cookie('openApp', appCode, {expires: config.cookieLife, path: config.webRoot});
/* Highlight at main menu */
var $menuMainNav = $('#menuMainNav,#menuMoreNav');
var $lastActiveNav = $menuMainNav.find('li.active');
if($lastActiveNav.data('app') !== appCode)
{
$lastActiveNav.removeClass('active');
$menuMainNav.find('li[data-app="' + appCode + '"]').addClass('active');
}
/* Create pate app object and store it */
var app = openedApps[appCode];
if(app)
@@ -230,6 +218,18 @@
if(!url) url = appsMap[appCode].url;
}
/* Set openApp cookie */
$.cookie('openApp', appCode, {expires: config.cookieLife, path: config.webRoot});
/* Highlight at main menu */
var $menuMainNav = $('#menuMainNav,#menuMoreNav');
var $lastActiveNav = $menuMainNav.find('li.active');
if($lastActiveNav.data('app') !== appCode)
{
$lastActiveNav.removeClass('active');
$menuMainNav.find('li[data-app="' + appCode + '"]').addClass('active');
}
/* Show page app and update iframe source */
if(url) reloadApp(appCode, url);
app.zIndex = openedAppZIndex++;