From 963febc15c37caa404bfba3df7fccdbcfbf2adff Mon Sep 17 00:00:00 2001 From: wolfcode <37436228+wolf-leo@users.noreply.github.com> Date: Mon, 21 Oct 2024 16:27:48 +0800 Subject: [PATCH] =?UTF-8?q?feat(admin):=20=E6=96=B0=E5=A2=9E=E5=BC=B9?= =?UTF-8?q?=E6=A1=86=E6=98=AF=E5=90=A6=E5=85=81=E8=AE=B8=E5=9C=A8=E6=96=B0?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=A1=B5=E4=B8=AD=E6=89=93=E5=BC=80=20add=20?= =?UTF-8?q?option=20to=20open=20iframe=20in=20new=20tab?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add 'iframe_open_top' configuration to admin site settings - Implement functionality to open iframe in new tab if configured - Update admin layout to include new configuration option - Modify easy-admin.js to support new tab opening for iframes Signed-off-by: wolfcode <37436228+wolf-leo@users.noreply.github.com> --- app/admin/view/layout/default.html | 5 +++-- app/admin/view/system/config/site.html | 9 +++++++++ app/common/controller/AdminController.php | 1 + public/static/plugs/easy-admin/easy-admin.js | 8 ++++++++ 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/app/admin/view/layout/default.html b/app/admin/view/layout/default.html index 041618f..3b858dc 100644 --- a/app/admin/view/layout/default.html +++ b/app/admin/view/layout/default.html @@ -21,8 +21,9 @@ IS_SUPER_ADMIN: "{$isSuperAdmin|default='false'}", VERSION: "{$version|default='1.0.0'}", CSRF_TOKEN: "{:token()}", - ADMIN_UPLOAD_URL: "{$adminUploadUrl|DEFAULT=''}", - EDITOR_TYPE: "{$adminEditor|default='ueditor'}", + ADMIN_UPLOAD_URL: "{$adminUploadUrl|default=''}", + IFRAME_OPEN_TOP: "{$iframeOpenTop|default=0}", + EDITOR_TYPE: "{$adminEditor|default='wangEditor'}", }; diff --git a/app/admin/view/system/config/site.html b/app/admin/view/system/config/site.html index e8e606c..f4451b4 100644 --- a/app/admin/view/system/config/site.html +++ b/app/admin/view/system/config/site.html @@ -54,6 +54,15 @@ +
+ +
+ + +
+ 是否允许弹框在新标签页打开。 +
+
diff --git a/app/common/controller/AdminController.php b/app/common/controller/AdminController.php index 733548c..1a83c54 100644 --- a/app/common/controller/AdminController.php +++ b/app/common/controller/AdminController.php @@ -240,6 +240,7 @@ class AdminController extends BaseController 'version' => env('APP_DEBUG') ? time() : ConfigService::getVersion(), 'adminUploadUrl' => url('ajax/upload', [], false), 'adminEditor' => sysConfig('site', 'editor_type') ?: 'wangEditor', + 'iframeOpenTop' => sysConfig('site', 'iframe_open_top') ?: 0, ]; View::assign($data); } diff --git a/public/static/plugs/easy-admin/easy-admin.js b/public/static/plugs/easy-admin/easy-admin.js index 6255e3b..d78c3d7 100644 --- a/public/static/plugs/easy-admin/easy-admin.js +++ b/public/static/plugs/easy-admin/easy-admin.js @@ -977,6 +977,14 @@ define(["jquery", "tableSelect"], function ($, tableSelect) { before: function () { }, success: function (layero, index) { + if (window.CONFIG.IFRAME_OPEN_TOP == '1') { + let _winTopBtn = ` + + 新标签页打开 + ` + $('.layui-layer-iframe').append(_winTopBtn) + } }, end: function () { index = null