Merge branch release/21.7.6 of zentao/zentaopms (#11966)

This commit is contained in:
刘刚
2025-10-21 13:40:26 +08:00
committed by Gitfox
2 changed files with 13 additions and 2 deletions
+4 -1
View File
@@ -433,5 +433,8 @@ $(() =>
}
/* Bind AI commands in app when app is loaded. */
$(document).on('loadapp.apps', (_, args) => bindAICommandsInApp(args[0].iframe.contentWindow));
$(document).on('loadapp.apps', (_, args) =>
{
setTimeout(() => bindAICommandsInApp(args[0].iframe.contentWindow), 1000);
});
});
+9 -1
View File
@@ -1810,7 +1810,15 @@
delete options.loadId;
}
if(url && ((/^(https?|javascript):/.test(url) && !options.app) || url.startsWith('#'))) return;
if(url)
{
if(/^(https?|javascript):/.test(url) && !options.app) return;
if(url[0] === '#')
{
if(/firefox/i.test(navigator.userAgent)) e.preventDefault();
return;
}
}
if(!url && $link.is('a') && !options.back && !options.load) return;
if($modal.length)