From 0efaed4832fd59f9c89f25434c3ce3fa9ba73aa5 Mon Sep 17 00:00:00 2001
From: j m <1406993111@qq.com>
Date: Thu, 5 Dec 2024 06:50:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=20=E9=85=8D=E7=BD=AE=E9=A1=B9=20=E8=B0=83=E6=95=B4=E4=B8=BA=20?=
 =?UTF-8?q?Html=E8=BE=93=E5=85=A5=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json            | 8 ++++----
 settings.yaml                | 8 +++++---
 templates/common/footer.html | 2 +-
 theme.yaml                   | 2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ab04d30..a928d7f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "html2canvas": "^1.4.1",
         "qrcode": "^1.5.1",
-        "remixicon": "^4.3.0"
+        "remixicon": "^4.5.0"
       },
       "devDependencies": {
         "@babel/core": "^7.15.5",
@@ -7377,9 +7377,9 @@
       }
     },
     "node_modules/remixicon": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/remixicon/-/remixicon-4.3.0.tgz",
-      "integrity": "sha512-jRYQ37dTFSkJtvcxwTUAkIiXkYRvA9EDvVuXPNrmt2xf/VS//CRgFtsX2TAFBoQOhh9SDh7l6La4Xu12snEyxg=="
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/remixicon/-/remixicon-4.5.0.tgz",
+      "integrity": "sha512-IP/wNQGG3JCigaeFF3DERSTqMIZBlNu1yu8clNGB7wFe7ZN/ueKMplFHL5uEbnGpCzqfY6MlxIYn2vRzub+5cQ=="
     },
     "node_modules/remove-bom-buffer": {
       "version": "3.0.0",
diff --git a/settings.yaml b/settings.yaml
index 44c211e..198b6d2 100644
--- a/settings.yaml
+++ b/settings.yaml
@@ -46,10 +46,12 @@ spec:
           name: record_number_ps
           label: 公安部备案
           placeholder: 'X公网安备 XXXXXXXXXXXXXX号'
-        - $formkit: text
+        - $formkit: code
           name: custom_text
+          language: html
+          height: 45px
           label: 自定义内容
-          placeholder: '自定义内容'
+          placeholder: '自定义内容，支持html'
           help: '在网站页脚建站时间上方显示自定义内容。'
         - $formkit: datetime-local
           name: website_time
@@ -126,7 +128,7 @@ spec:
               label: 控制台鼠标悬停提示，留空不显示
             - $formkit: text
               name: console_url
-              validation: required
+              validation: requiredc
               if: $get(show_console).value
               label: 未登录时，控制台跳转URL
               value: '/login'
diff --git a/templates/common/footer.html b/templates/common/footer.html
index 2e1cc42..a73c2fe 100644
--- a/templates/common/footer.html
+++ b/templates/common/footer.html
@@ -21,7 +21,7 @@
                         th:src="${#theme.assets('/img/ba.webp')}" height="auto" width="auto" alt="备案" style="vertical-align: text-top; width: 1.2em; margin-right: 4px;"/>[[${theme.config.basic_info.record_number}]]</a>
                     <a th:if="${!#strings.isEmpty(theme.config.basic_info.record_number_ps)}" class="record footer-truncation" th:href="'https://beian.mps.gov.cn/#/query/webSearch?code=' + ${theme.config.basic_info.record_number_ps.replaceAll('[^\d]', '')}" target="_blank" rel="noopener noreferrer nofollow"><img
                         th:src="${#theme.assets('/img/ga.webp')}" height="auto" width="auto" alt="公网安备" style="vertical-align: text-top; width: 1.2em; margin-right: 4px;"/>[[${theme.config.basic_info.record_number_ps}]]</a></p>
-                <p th:if="${!#strings.isEmpty(theme.config.basic_info.custom_text)}">[[${theme.config.basic_info.custom_text}]]</p>
+                <p th:if="${!#strings.isEmpty(theme.config.basic_info.custom_text)}" th:utext="${theme.config.basic_info.custom_text}"></p>
                 <p class="icon-spot" th:if="${!#strings.isEmpty(theme.config.basic_info.website_time) || theme.config.enhance.enable_busuanzi == true}">
                 <span th:if="${!#strings.isEmpty(theme.config.basic_info.website_time)}" id="websiteDate">建站<span class="stand">00</span>天<span class="stand">0</span>时<span class="stand">0</span>分<span class="stand">0</span>秒</span>
                 <span th:if="${theme.config.enhance.busuanzi_group.enable_busuanzi == true}" class="icon-spot footer-truncation">
diff --git a/theme.yaml b/theme.yaml
index 7c8f5b6..50df1f6 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.beta4
+  version: 1.3.2.beta5
   # 最低支持的 Halo 版本
   require: ">=2.20.0"
   # 许可