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

* index: fix behavior on click menu link.

Browse Source
This commit is contained in:
sunhao
2024-03-27 17:23:11 +08:00
committed by liyang
parent cf6db40446
commit 2e053d7eb4
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/index/js/index.ui.js
+6 -3
View File
@@ -137,7 +137,7 @@ function openApp(url, code, options)
}
/* Show and load app */
const isSameUrl = openedApp.currentUrl === url;
const isSameUrl = $.parseLink(openedApp.currentUrl).url === $.parseLink(url).url;
const needLoad = !isSameUrl || forceReload !== false;
if(needLoad)
{
@@ -174,7 +174,7 @@ function openApp(url, code, options)
$tabs.find('li[data-app="' + code + '"]>a').addClass('active');
}
if(debug) console.log('[APPS]', 'open:', code, {url, options, forceReload});
if(debug) console.log('[APPS]', 'open:', code, {url, options, needLoad, forceReload});
triggerAppEvent(code, 'openapp', [openedApp, {load: needLoad}]);
return openedApp;
@@ -756,7 +756,10 @@ $(document).on('click', '.open-in-app,.show-in-app', function(e)
if($link.is('[data-modal],[data-toggle],.iframe,.not-in-app')) return;
const url = $link.attr('href') || $link.data('url');
if(url && url.includes('onlybody=yes')) return;
if(openApp(url, $link.data('app'), !$link.hasClass('show-in-app'))) e.preventDefault();
const code = $link.data('app');
if($.apps.openedMap[code]) showApp(code);
else openApp(url, $link.data('app'), !$link.hasClass('show-in-app'));
e.preventDefault();
}).on('contextmenu', '.open-in-app,.show-in-app', function(event)
{
const $btn = $(this);
www/js/zui3/zin.js
+1 -1
View File
@@ -1341,7 +1341,7 @@
if(isInAppTab) window.parent.$('body').trigger('click');
const $link = $(e.target).closest('a,.open-url');
if(!$link.length || $link.hasClass('ajax-submit') || $link.attr('data-on') || $link.hasClass('not-open-url') || ($link.attr('target') || '')[0] === '_') return;
if(!$link.length || $link.hasClass('ajax-submit') || $link.attr('data-on') || $link.hasClass('show-in-app') || $link.hasClass('not-open-url') || ($link.attr('target') || '')[0] === '_') return;
const href = $link.attr('href');
if($link.is('a') && (/^(https?|javascript):/.test(href)) && !$link.data('app')) return;