Merge pull request #543 from chengzhongxue/main

优化配置

settings.yaml

@@ -7,10 +7,12 @@ spec:
     - group: basics
       label: 基础
       formSchema:
-        - $formkit: text
+        - $formkit: code
           name: siteTitle
           label: 站点名称
           placeholder: 请输入站点名称
+          height: 80px
+          language: html
           help: 支持 HTML 语法
         - $formkit: date
           name: siteStartTime
@@ -286,15 +288,19 @@ spec:
                 - $formkit: color
                   name: background
                   label: 背景色
-            - $formkit: textarea
+            - $formkit: code
               name: bannersTitleBig
               label: 大标题
               placeholder: 请输入大标题
+              height: 80px
+              language: html
               help: 支持 HTML 语法
-            - $formkit: textarea
+            - $formkit: code
               name: bannersTitleSmall
               label: 小标题
               placeholder: 请输入小标题
+              height: 80px
+              language: html
               help: 支持 HTML 语法
             - $formkit: repeater
               name: categoryGroup
@@ -623,10 +629,12 @@ spec:
               label: 卡片名称
               placeholder: 请填写个人卡片名称
               help: 不填写默认为站点则名称
-            - $formkit: textarea
+            - $formkit: code
               name: profileDesc
               label: 描述信息
               placeholder: 请填写个人卡片描述信息
+              height: 200px
+              language: html
               help: 支持 HTML 语法
             - $formkit: repeater
               name: socialMedia
@@ -908,11 +916,12 @@ spec:
                   value: true
                 - label: 隐藏
                   value: false
-            - $formkit: textarea
+            - $formkit: code
               if: $get(footer_bar_enable).value
               name: logo
               label: logo
-              placeholder:
+              height: 80px
+              language: html
               help: 支持 HTML 语法
             - $formkit: textarea
               if: $get(footer_bar_enable).value
@@ -1310,15 +1319,19 @@ spec:
               name: reprintUrl
               label: 转载链接
               placeholder: 请输入链接
-            - $formkit: textarea
+            - $formkit: code
               name: content
               label: 原创声明内容
               placeholder: '本文是原创文章，采用 <a target="_blank" href="/cc">CC BY-NC-ND 4.0</a> 协议，完整转载请注明来自 <a href="/" target="_blank" >程序员小航</a>'
+              height: 120px
+              language: html
               help: 支持 HTML 语法
-            - $formkit: textarea
+            - $formkit: code
               name: reprintContent
               label: 转载声明内容
               placeholder: '本文是转载文章，版权归原作者所有。建议访问原文，转载本文请联系原作者。'
+              height: 120px
+              language: html
               help: 支持 HTML 语法
         - $formkit: select
           name: recommendQuantity
@@ -1404,7 +1417,7 @@ spec:
               value: false
         - $formkit: code
           name: linksArticle
-          height: 200px
+          height: 300px
           label: 底部显示内容
           language: html
 
@@ -1636,12 +1649,14 @@ spec:
               value: true
             - label: 禁用
               value: false
-        - $formkit: textarea
+        - $formkit: code
           if: $get(enable_envelope_comment).value
           name: title
           label: 标题
           placeholder: 请输入内容
           value: <div align="center">留言板</div>
+          height: 80px
+          language: html
           help: 支持 HTML 语法
         - $formkit: group
           name: custom_pic
@@ -1706,11 +1721,41 @@ spec:
     - group: about
       label: 关于
       formSchema:
-        - $formkit: textarea
+        - $formkit: repeater
-          name: widgets
+          name: widgetList
           label: 小部件
-          value: content-idea,hello-about,authorCareers,personalities-photo,textarea,game,like-music,statistics-map
+          help: 我的介绍&我的想法, 我的问候, 技能&职业生涯, 性格&图片, 座右铭, 爱好, 关注偏好&音乐偏好, 数据统计&作者相关信息。
-          help: content-idea（我的介绍&我的想法）, hello-about（我的问候）, authorCareers（技能&职业生涯）, personalities-photo（性格&图片）, textarea（座右铭）, game（爱好）, like-music（关注偏好&音乐偏好）, statistics-map（数据统计&音乐偏好）。你可以随意组合或排序，以逗号隔开。
+          value:
+            - widgetId: content-idea
+            - widgetId: hello-about
+            - widgetId: authorCareers
+            - widgetId: personalities-photo
+            - widgetId: textarea
+            - widgetId: game
+            - widgetId: like-music
+            - widgetId: statistics-map
+          children:
+            - $formkit: select
+              name: widgetId
+              id: widgetId
+              label: 模块
+              options:
+                - value: content-idea
+                  label: 我的介绍&我的想法
+                - value: hello-about
+                  label: 我的问候
+                - value: authorCareers
+                  label: 技能&职业生涯
+                - value: personalities-photo
+                  label: 性格&图片
+                - value: textarea
+                  label: 座右铭
+                - value: game
+                  label: 爱好
+                - value: like-music
+                  label: 关注偏好&音乐偏好
+                - value: statistics-map
+                  label: 数据统计&作者相关信息
         - $formkit: repeater
           name: authorInfoLeftTags
           label: 个人标签-左
@@ -1731,15 +1776,19 @@ spec:
               name: tag
               label: 标签
               placeholder: 请输入内容
-        - $formkit: textarea
+        - $formkit: code
           name: content
           label: 我的介绍
           value: <div class="title1">你好，很高兴认识你👋</div> <div class="title2">我叫 <span class="inline-word">程序员小航</span></div> <div class="title1">是一名 前端开发工程师、后端开发工程师、全干工程师</div>
+          height: 200px
+          language: html
           help: 支持 HTML 语法
-        - $formkit: textarea
+        - $formkit: code
           name: idea
           label: 我的想法
           value: <div class="author-content-item-tips">一定</div> <h2>记得<br> 修改这块<span class="inline-word">代码</span> <div class="mask"> <span class="first-tips" data-show="">优秀的产品</span> <span>出色的设计</span> <span>高效的编程</span> <span data-up="">人性化的用户体验</span> </div> </h2>
+          height: 200px
+          language: html
           help: 支持 HTML 语法
         - $formkit: text
           name: helloAbout
@@ -2023,10 +2072,12 @@ spec:
                   label: 内容颜色
                   placeholder: 请输入内容
                   value: '#ffffff'
-        - $formkit: textarea
+        - $formkit: code
           name: xjlc
           label: 心路历程
           value: <div class="author-content-item-tips">心路历程</div> <span class="author-content-item-title">为什么建站？</span> <br>创建这个站的时候，想要就是能够有一个自己能够<b>积累知识、积累兴趣</b>的地方。和他人分享，会让这些成为积累和沉淀。如果能够帮助到更多的人，帮助更多人解决问题，那一定是非常棒的事情。<br> 分享这件事我从很早就开始了，起初做的微信公众号，现在做的网站。因为我比较喜欢研究数码和软件，想要探究在互联网上的事物是如何被创造和发展。网络给我带来了非常多的知识和眼界，我也想力所能及的分享一些我生活的琐碎知识。<br>与大多数垂直类的技术博客不同，这里的种类会非常的繁杂，有<b>技能的教程干货</b>、有<b>生活上的吐槽和妙招</b>、有<b>话题上的思考和想法</b>。一般我研究什么、发现了什么都会分享在这里。<br> 这些就是创造这个小站的本意，<b>也是我分享生活的方式</b>。有幸能和你相遇在这里，相信我们能共同留下一段美好记忆。</p>
+          height: 200px
+          language: html
           help: 支持 HTML 语法
 
     - group: aboutReward

templates/about.html

@@ -43,7 +43,7 @@
                     <div class="author-title">关于本站</div>
 
 
-                    <th:block th:replace="~{modules/about-widgets :: about-widgets(${theme.config.about.widgets})}"></th:block>
+                    <th:block th:replace="~{modules/about-widgets :: about-widgets(${theme.config.about.widgetList})}"></th:block>
 
                     <div class="author-content">
                         <div class="create-site-post author-content-item single" th:utext="${theme.config.about.xjlc}">

templates/assets/icon/demo_index.html

@@ -54,6 +54,18 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon haofont">&#xe821;</span>
+                <div class="name">moon-clear-fill</div>
+                <div class="code-name">&amp;#xe821;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon haofont">&#xe698;</span>
+                <div class="name">eicon_train-line</div>
+                <div class="code-name">&amp;#xe698;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon haofont">&#xe6fd;</span>
                 <div class="name">disc-fill</div>
@@ -894,18 +906,6 @@
                 <div class="code-name">&amp;#xe65a;</div>
               </li>
           
-            <li class="dib">
-              <span class="icon haofont">&#xe65b;</span>
-                <div class="name">jike</div>
-                <div class="code-name">&amp;#xe65b;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon haofont">&#xe65c;</span>
-                <div class="name">jike</div>
-                <div class="code-name">&amp;#xe65c;</div>
-              </li>
-          
             <li class="dib">
               <span class="icon haofont">&#xe65d;</span>
                 <div class="name">heartbeat</div>
@@ -1092,12 +1092,12 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'haofont';
-  src: url('iconfont.eot?t=1699690237296'); /* IE9 */
+  src: url('iconfont.eot?t=1699854542133'); /* IE9 */
-  src: url('iconfont.eot?t=1699690237296#iefix') format('embedded-opentype'), /* IE6-IE8 */
+  src: url('iconfont.eot?t=1699854542133#iefix') format('embedded-opentype'), /* IE6-IE8 */
-       url('iconfont.woff2?t=1699690237296') format('woff2'),
+       url('iconfont.woff2?t=1699854542133') format('woff2'),
-       url('iconfont.woff?t=1699690237296') format('woff'),
+       url('iconfont.woff?t=1699854542133') format('woff'),
-       url('iconfont.ttf?t=1699690237296') format('truetype'),
+       url('iconfont.ttf?t=1699854542133') format('truetype'),
-       url('iconfont.svg?t=1699690237296#haofont') format('svg');
+       url('iconfont.svg?t=1699854542133#haofont') format('svg');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -1123,6 +1123,24 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon haofont hao-icon-moon-clear-fill"></span>
+            <div class="name">
+              moon-clear-fill
+            </div>
+            <div class="code-name">.hao-icon-moon-clear-fill
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon haofont hao-icon-eicon_train-line"></span>
+            <div class="name">
+              eicon_train-line
+            </div>
+            <div class="code-name">.hao-icon-eicon_train-line
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon haofont hao-icon-disc-fill"></span>
             <div class="name">
@@ -2383,24 +2401,6 @@
             </div>
           </li>
           
-          <li class="dib">
-            <span class="icon haofont hao-icon-a-2"></span>
-            <div class="name">
-              jike
-            </div>
-            <div class="code-name">.hao-icon-a-2
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon haofont hao-icon-jike"></span>
-            <div class="name">
-              jike
-            </div>
-            <div class="code-name">.hao-icon-jike
-            </div>
-          </li>
-          
           <li class="dib">
             <span class="icon haofont hao-icon-heartbeat1"></span>
             <div class="name">
@@ -2680,6 +2680,22 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#hao-icon-moon-clear-fill"></use>
+                </svg>
+                <div class="name">moon-clear-fill</div>
+                <div class="code-name">#hao-icon-moon-clear-fill</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#hao-icon-eicon_train-line"></use>
+                </svg>
+                <div class="name">eicon_train-line</div>
+                <div class="code-name">#hao-icon-eicon_train-line</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#hao-icon-disc-fill"></use>
@@ -3800,22 +3816,6 @@
                 <div class="code-name">#hao-icon-heartbeat</div>
             </li>
           
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#hao-icon-a-2"></use>
-                </svg>
-                <div class="name">jike</div>
-                <div class="code-name">#hao-icon-a-2</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#hao-icon-jike"></use>
-                </svg>
-                <div class="name">jike</div>
-                <div class="code-name">#hao-icon-jike</div>
-            </li>
-          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#hao-icon-heartbeat1"></use>

templates/assets/icon/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: "haofont"; /* Project id 4159149 */
-  src: url('iconfont.eot?t=1699690237296'); /* IE9 */
+  src: url('iconfont.eot?t=1699854542133'); /* IE9 */
-  src: url('iconfont.eot?t=1699690237296#iefix') format('embedded-opentype'), /* IE6-IE8 */
+  src: url('iconfont.eot?t=1699854542133#iefix') format('embedded-opentype'), /* IE6-IE8 */
-       url('iconfont.woff2?t=1699690237296') format('woff2'),
+       url('iconfont.woff2?t=1699854542133') format('woff2'),
-       url('iconfont.woff?t=1699690237296') format('woff'),
+       url('iconfont.woff?t=1699854542133') format('woff'),
-       url('iconfont.ttf?t=1699690237296') format('truetype'),
+       url('iconfont.ttf?t=1699854542133') format('truetype'),
-       url('iconfont.svg?t=1699690237296#haofont') format('svg');
+       url('iconfont.svg?t=1699854542133#haofont') format('svg');
 }
 
 .haofont {
@@ -16,6 +16,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.hao-icon-moon-clear-fill:before {
+  content: "\e821";
+}
+
+.hao-icon-eicon_train-line:before {
+  content: "\e698";
+}
+
 .hao-icon-disc-fill:before {
   content: "\e6fd";
 }
@@ -576,14 +584,6 @@
   content: "\e65a";
 }
 
-.hao-icon-a-2:before {
-  content: "\e65b";
-}
-
-.hao-icon-jike:before {
-  content: "\e65c";
-}
-
 .hao-icon-heartbeat1:before {
   content: "\e65d";
 }

templates/assets/icon/iconfont.json

@@ -5,6 +5,20 @@
   "css_prefix_text": "hao-icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "17511807",
+      "name": "moon-clear-fill",
+      "font_class": "moon-clear-fill",
+      "unicode": "e821",
+      "unicode_decimal": 59425
+    },
+    {
+      "icon_id": "22554653",
+      "name": "eicon_train-line",
+      "font_class": "eicon_train-line",
+      "unicode": "e698",
+      "unicode_decimal": 59032
+    },
     {
       "icon_id": "8555184",
       "name": "disc-fill",
@@ -985,20 +999,6 @@
       "unicode": "e65a",
       "unicode_decimal": 58970
     },
-    {
-      "icon_id": "35014836",
-      "name": "jike",
-      "font_class": "a-2",
-      "unicode": "e65b",
-      "unicode_decimal": 58971
-    },
-    {
-      "icon_id": "35015039",
-      "name": "jike",
-      "font_class": "jike",
-      "unicode": "e65c",
-      "unicode_decimal": 58972
-    },
     {
       "icon_id": "35015857",
       "name": "heartbeat",

templates/assets/zhheo/zhheoblog.css

@@ -721,6 +721,16 @@ template {
     }
 }
 
+@keyframes heo-spin {
+    0% {
+        transform: rotate(0)
+    }
+
+    100% {
+        transform: rotate(360deg)
+    }
+}
+
 :root {
     --global-font-size: 16px;
     --global-bg: #fff;
@@ -5152,7 +5162,7 @@ html {
 }
 
 .console-button .back-menu-list-groups .back-menu-list {
-    display: flex;
+    display: block;
     flex-direction: row;
     flex-wrap: wrap;
     width: 140px;
@@ -5206,10 +5216,6 @@ html {
     transform: scale(1);
 }
 
-.console-button .back-menu-list .back-menu-item {
-    width: 140px;
-}
-
 @media screen and (max-width: 768px) {
 
     .console-button .back-menu-list-groups {

templates/modules/about-widgets.html

@@ -3,16 +3,9 @@
 
 <!-- 关于小组件 -->
 <th:block th:fragment="about-widgets(widgets)"
-     th:if="${ not #strings.isEmpty(widgets)}">
+     th:if="${not #lists.isEmpty(widgets)}">
-
+        <th:block th:each="widget : ${widgets}">
-    <th:block>
+            <th:block th:replace="~{'modules/widgets/about-widgets/'+ ${widget.widgetId}}"/>
-        <th:block th:each="widget : ${#strings.listSplit(widgets, ',')}">
-            <th:block >
-                <th:block th:replace="~{'modules/widgets/about-widgets/'+ ${widget}}"/>
-            </th:block>
         </th:block>
-    </th:block>
-
-
 </th:block>
 </html>

templates/modules/category-filter.html

@@ -1,4 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-</html>

templates/modules/head.html

@@ -166,7 +166,7 @@
     <script th:src="${assets_link + '/libs/clipboard/clipboard.min.js'}"></script>
 
     <!-- 关于统计-->
-    <script th:if="${#strings.contains(theme.config.about.widgets,'statistics-map')}" th:src="${assets_link + '/libs/countup/countup.js'}"></script>
+    <script th:if="${#strings.contains(theme.config.about.widgetList,'statistics-map')}" th:src="${assets_link + '/libs/countup/countup.js'}"></script>
 
     <!-- 小板报 -->
     <th:block th:if="${not #strings.isEmpty(theme.config.sidebar.welcome.key)}">

templates/modules/layouts/layout.html

@@ -49,10 +49,10 @@
 
 
 <!-- todo 右下角悬浮操作按钮 -->
-<th:block th:replace="~{modules/common/rightside :: rightside}"></th:block>
+<th:block th:replace="~{modules/widgets/rightside :: rightside}"></th:block>
 
 
-<div th:replace="~{modules/right-menu :: right-menu}"></div>
+<div th:replace="~{modules/widgets/right-menu :: right-menu}"></div>
 
 <div>
     <script th:src="${assets_link + '/js/utils.js' + theme_version}"></script>

templates/modules/widgets/about-widgets/statistics-map.html

@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
-<!-- 数据统计&音乐偏好 -->
+<!-- 数据统计&作者相关信息 -->
 <div class="author-content" th:fragment="statistics-map">
     <div class="about-statistic author-content-item"
          style="background: url(https://bu.dusays.com/2023/03/12/640dc8c72f623.webp);">

templates/modules/widgets/console.html

@@ -115,7 +115,7 @@
   <div class="button-group">
     <div class="console-btn-item">
       <a class="darkmode_switchbutton" href="javascript:void(0);" onclick="navFn.switchDarkMode();" rel="external nofollow"
-         title="显示模式切换"><i class="haofont hao-icon-moon" style="font-size:1rem"></i>
+         title="显示模式切换"><i class="haofont hao-icon-moon-clear-fill" style="font-size:1rem"></i>
       </a>
     </div>
     <div class="console-btn-item" id="consoleHideAside" onclick="heo.hideAsideBtn()" title="边栏显示控制"><a

templates/modules/widgets/nav-right.html

@@ -10,7 +10,7 @@
     <div class="nav-button only-home" id="travellings_button" title="随机前往一个开往项目网站" th:if="${theme.config.nav.right.travelling}">
         <a class="site-page" onclick="totraveling()" href="javascript:void(0);"  rel="external nofollow"
            title="随机前往一个开往项目网站">
-            <i class="haofont hao-icon-train" style="font-size: 0.94rem"></i>
+            <i class="haofont hao-icon-eicon_train-line"></i>
         </a>
     </div>
 
@@ -24,7 +24,7 @@
     <div class="nav-button" id="darkmode_button" th:if="${theme.config.nav.right.darkMode}">
         <a class="console_switchbutton" href="javascript:void(0);"  onclick="navFn.switchDarkMode();" rel="external nofollow"
            title="切换模式 - 日夜交替，黑白互换。">
-            <i class="haofont hao-icon-circle-half-stroke" style="font-size: 1rem; font-weight: 700;"></i>
+            <i class="haofont hao-icon-moon-clear-fill" style="font-size: 1rem;"></i>
         </a>
     </div>
 
@@ -39,7 +39,7 @@
     <div th:if="${theme.config.nav.right.navLogin}" class="console-button" tabindex="-1"
          th:with="currentUser = ${contributorFinder.getContributor(#authentication.name)}">
         <span class="site-page nav-login">
-            <i sec:authorize="isAnonymous()" class="haofont hao-icon-zhanghao1 " style="font-size: 1rem;font-weight: 700;"></i>
+            <i sec:authorize="isAnonymous()" class="haofont hao-icon-zhanghao1 " style="font-size: 19.5px;"></i>
             <img sec:authorize="isAuthenticated()"  th:src="${currentUser.avatar}"
                  th:alt="${currentUser.displayName}"
                  style=" width: 24px; height: 24px; border-radius: 9999px" />
@@ -47,12 +47,15 @@
         <div class="back-menu-list-groups">
             <div class="back-menu-list-group" style="margin: -4px -9px -4px -18px">
                 <div class="back-menu-list">
-                    <a sec:authorize="isAuthenticated()" class="back-menu-item" rel="external nofollow" target="_blank" href="/console">
+                    <th:block sec:authorize="isAuthenticated()">
-                        <span class="back-menu-item-text">控制台</span>
+                        <a class="back-menu-item" rel="external nofollow" target="_blank" href="/console">
-                    </a>
+                            <span class="back-menu-item-text">控制台</span>
-                    <!-- <a sec:authorize="isAuthenticated()" class="back-menu-item" rel="external nofollow" href="/logout">
+                        </a>
-                        <span class="back-menu-item-text">退出登录</span>
+                        <a class="back-menu-item" rel="external nofollow"
-                    </a> -->
+                           href="javascript:$.ajax({type: 'post',url:'/logout'});window.location.reload()">
+                            <span class="back-menu-item-text">退出登录</span>
+                        </a>
+                    </th:block>
                     <a sec:authorize="isAnonymous()" class="back-menu-item" rel="external nofollow" target="_blank" href="/console/login">
                         <span class="back-menu-item-text">登录</span>
                     </a>

templates/modules/widgets/right-menu.html

@@ -108,7 +108,7 @@
                 <span class="menu-commentBarrage-text">关闭热评</span>
             </div>
             <div class="rightMenu-item" id="menu-darkmode">
-                <i class="haofont hao-icon-circle-half-stroke"></i>
+                <i class="haofont hao-icon-moon-clear-fill" style="font-size: 19px;"></i>
                 <span class="menu-darkmode-text">深色模式</span>
             </div>
             <div th:if="${theme.config.style.translate.translateEnable}" class="rightMenu-item" id="menu-translate">