From 428b401718034cbeee15c3bf4a5130e95f082497 Mon Sep 17 00:00:00 2001 From: Hao Sun Date: Mon, 23 Aug 2021 16:09:19 +0800 Subject: [PATCH] * bug #14554, fix refresh help app not work. --- module/index/js/index.js | 6 +++--- module/index/view/index.html.php | 8 +++++--- www/js/zui/min.js | 6 +++--- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/module/index/js/index.js b/module/index/js/index.js index 2cde601312..821a850644 100644 --- a/module/index/js/index.js +++ b/module/index/js/index.js @@ -17,9 +17,9 @@ { code: 'help', icon: 'icon-help', - url: $helpLink.attr('href'), + url: manualUrl || $helpLink.attr('href'), external: true, - text: $helpLink.text(), + text: manualText || $helpLink.text(), appUrl: config.webRoot + '#app=help' }; var $menuMainNav = $('#menuMainNav').empty(); @@ -400,7 +400,7 @@ } catch(_) { - iframe.src = url || app.url; + iframe.src = url || app.url || iframe.src; } } diff --git a/module/index/view/index.html.php b/module/index/view/index.html.php index 843e542ec1..a7d36a5555 100644 --- a/module/index/view/index.html.php +++ b/module/index/view/index.html.php @@ -14,10 +14,12 @@ include '../../common/view/header.lite.html.php'; $this->app->loadConfig('sso'); if(!empty($config->sso->redirect)) js::set('ssoRedirect', $config->sso->redirect); -js::set('navGroup', $lang->navGroup); -js::set('appsLang', $lang->index->app); +js::set('navGroup', $lang->navGroup); +js::set('appsLang', $lang->index->app); js::set('appsMenuItems', commonModel::getMainNavList($app->rawModule)); -js::set('defaultOpen', $open); +js::set('defaultOpen', $open); +js::set('manualText', $lang->manual); +js::set('manualUrl', ((!empty($config->isINT)) ? $config->manualUrl['int'] : $config->manualUrl['home']) . '&theme=' . $_COOKIE['theme']); ?>