From 1e0f8db9b8d704226f8cde1642813af7f5e5de3f Mon Sep 17 00:00:00 2001 From: mjsoftware <1406993111@qq.com> Date: Tue, 3 Dec 2024 10:12:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=8F=B0=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9C=AA=E7=99=BB=E5=BD=95=E3=80=81=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E5=90=8E=E8=B7=B3=E8=BD=AC=E5=9C=B0=E5=9D=80=E5=92=8C?= =?UTF-8?q?=E8=B7=B3=E8=BD=ACurl=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- settings.yaml | 26 +++++++++++++++++++++++--- templates/common/layout.html | 3 ++- templates/common/navbar.html | 3 ++- theme.yaml | 2 +- 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/settings.yaml b/settings.yaml index 3d8befa..44c211e 100644 --- a/settings.yaml +++ b/settings.yaml @@ -128,13 +128,33 @@ spec: name: console_url validation: required if: $get(show_console).value - label: 控制台跳转URL - help: '控制台跳转URL,可使用“redirect_uri”参数进行登录后跳转,例如:“/login?redirect_uri=/”,登录后默认跳转到前台页面。' + label: 未登录时,控制台跳转URL + value: '/login' + help: '未登录时,控制台跳转URL,可使用“redirect_uri”参数进行登录后跳转,例如:“/login?redirect_uri=/”,登录后默认跳转到前台页面。' - $formkit: radio if: $get(show_console).value name: console_target validation: required - label: 控制台跳转方式 + value: _blank + label: 未登录时,控制台跳转方式 + options: + - value: _blank + label: 新标签页 + - value: _self + label: 当前窗口 + - $formkit: text + name: console_logon_url + validation: required + if: $get(show_console).value + value: '/console' + label: 登录时,控制台跳转URL + help: '登录时,控制台跳转URL。' + - $formkit: radio + if: $get(show_console).value + name: console_logon_target + validation: required + value: _blank + label: 登录时,控制台跳转方式 options: - value: _blank label: 新标签页 diff --git a/templates/common/layout.html b/templates/common/layout.html index 2de7478..0ae491f 100644 --- a/templates/common/layout.html +++ b/templates/common/layout.html @@ -2,7 +2,8 @@ th:class="${theme.config.basic_style.theme_style}" th:fragment="layout (title, canonical, content, isPost)"> + enableComment = ${baseEnableComment == true && site.comment.enable}, + logonUserName = ${#authentication.name != 'anonymousUser' ? #authentication.name : ''}"> diff --git a/templates/common/navbar.html b/templates/common/navbar.html index 246e98e..754284f 100644 --- a/templates/common/navbar.html +++ b/templates/common/navbar.html @@ -69,7 +69,8 @@ - diff --git a/theme.yaml b/theme.yaml index 56fee00..7c8f5b6 100644 --- a/theme.yaml +++ b/theme.yaml @@ -30,7 +30,7 @@ spec: settingName: theme-dream2-plus-setting configMapName: theme-dream2-plus-configMap # 版本号 - version: 1.3.2.beta3 + version: 1.3.2.beta4 # 最低支持的 Halo 版本 require: ">=2.20.0" # 许可