From f192819305afe8d4e77f54aac8eecd2566e82701 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Tue, 18 Jun 2024 17:59:38 +0800 Subject: [PATCH] * [bug#51302,done,0.4h] add `zanode-create` to iframeList. --- module/common/model.php | 2 +- www/js/zui3/zin.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/common/model.php b/module/common/model.php index e2386c5eb7..e4e74d4176 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -1246,7 +1246,7 @@ eof; */ $module = $this->app->getModuleName(); $whitelist = is_string($whitelist) ? $whitelist : '|index|tutorial|install|upgrade|sso|cron|misc|user-login|user-deny|user-logout|user-reset|user-forgetpassword|user-resetpassword|my-changepassword|my-preference|file-read|file-download|file-preview|file-uploadimages|file-ajaxwopifiles|report-annualdata|misc-captcha|execution-printkanban|traincourse-ajaxuploadlargefile|traincourse-playvideo|screen-view|zanode-create|screen-ajaxgetchart|ai-chat|integration-wopi|'; - $iframeList = '|cron-index|'; + $iframeList = '|cron-index|zanode-create|'; if(strpos($iframeList, "|{$module}-{$method}|") === false && (strpos($whitelist, "|{$module}|") !== false || strpos($whitelist, "|{$module}-{$method}|") !== false)) return true; diff --git a/www/js/zui3/zin.js b/www/js/zui3/zin.js index 9cfacf25de..754d1ebc5b 100644 --- a/www/js/zui3/zin.js +++ b/www/js/zui3/zin.js @@ -9,7 +9,7 @@ const moduleMethod = `${currentModule}-${currentMethod}`; const selfOpenList = new Set('index|tutorial|install|upgrade|sso|cron|misc|user-login|user-deny|user-logout|user-reset|user-forgetpassword|user-resetpassword|my-changepassword|my-preference|file-read|file-download|file-preview|file-uploadimages|file-ajaxwopifiles|report-annualdata|misc-captcha|execution-printkanban|traincourse-ajaxuploadlargefile|traincourse-playvideo|screen-view|zanode-create|screen-ajaxgetchart|ai-chat'.split('|')); - const iframeList = new Set(['cron-index']); + const iframeList = new Set(['cron-index', 'zanode-create']); const isAllowSelfOpen = !iframeList.has(moduleMethod) && (isIndexPage || location.hash === '#_single'