Merge remote-tracking branch 'origin/main'

settings.yaml

@@ -80,8 +80,10 @@ spec:
           name: above
           label: 首页第一屏
           value:
-            bannersBackground:
+            enable_above:
-            bannersTitleBig:
+            typed:
+            index_img:
+            phone_index_img:
           children:
             - $formkit: radio
               name: enable_above
@@ -95,6 +97,7 @@ spec:
                   value: false
             - $formkit: repeater
               name: typed
+              if: $get(enable_above).value
               label: 打字机显示的文字
               value: [ ]
               children:
@@ -249,7 +252,7 @@ spec:
                   name: todayRecommendCover
                   label: 背景图
                   placeholder: 请输入地址
-                  value:  https://liuzhihang.com/upload/hao_dark.jpg
+                  value: https://liuzhihang.com/upload/hao_dark.jpg
                 - $formkit: select
                   name: recommendPost
                   id: recommendPost
@@ -266,7 +269,7 @@ spec:
                   name: recommendPostCustom
                   label: 自定义文章
                   help: 建议设置六篇文章
-                  value: []
+                  value: [ ]
                   children:
                     - $formkit: url
                       name: url
@@ -396,7 +399,7 @@ spec:
           name: postRandomImg
           label: 随机封面
           value: https://source.unsplash.com/random/600x400/?blog,scenery,night,desert,sea
-          help:  未设置文章封面时，将使用随机封面 (二次元随机图地址：https://www.dmoe.cc/random.php)
+          help: 未设置文章封面时，将使用随机封面 (二次元随机图地址：https://www.dmoe.cc/random.php)
         - $formkit: radio
           name: articleCardPolish
           label: 首页文章卡片(擦亮效果)
@@ -483,7 +486,7 @@ spec:
               label: 社交媒体
               help: 此处社交媒体最多设置两个
               max: 2
-              value: []
+              value: [ ]
               children:
                 - $formkit: select
                   name: icon
@@ -638,7 +641,7 @@ spec:
             - $formkit: repeater
               name: socialMediaLeft
               label: 左侧
-              value: []
+              value: [ ]
               children:
                 - $formkit: select
                   name: icon
@@ -719,7 +722,7 @@ spec:
             - $formkit: repeater
               name: socialMediaRight
               label: 右侧
-              value: []
+              value: [ ]
               children:
                 - $formkit: select
                   name: icon
@@ -2363,4 +2366,65 @@ spec:
             - label: 启用
               value: true
             - label: 禁用
-              value: false
+              value: false
+        - $formkit: group
+          name: greeting
+          label: 首页问候语
+          children:
+            - $formkit: radio
+              name: enable_greeting
+              key: enable_greeting
+              id: enable_greeting
+              value: false
+              options:
+                - label: 显示
+                  value: true
+                - label: 隐藏
+                  value: false
+            - $formkit: repeater
+              name: setting
+              if: $get(enable_greeting).value
+              label: 问候语配置
+              value:
+                - greeting: 晚安😴
+                  start_time: 0
+                  end_time: 5
+                - greeting: 早上好鸭👋, 祝你一天好心情！
+                  start_time: 6
+                  end_time: 9
+                - greeting: 上午好👋, 状态很好，鼓励一下
+                  start_time: 10
+                  end_time: 10
+                - greeting: 11点多啦, 在坚持一下就吃饭啦～
+                  start_time: 11
+                  end_time: 11
+                - greeting: 午安👋, 宝贝
+                  start_time: 12
+                  end_time: 14
+                - greeting: 🌈充实的一天辛苦啦！
+                  start_time: 14
+                  end_time: 18
+                - greeting: 19点喽, 奖励一顿丰盛的大餐吧🍔。
+                  start_time: 19
+                  end_time: 19
+                - greeting: 晚上好👋, 在属于自己的时间好好放松😌~
+                  start_time: 20
+                  end_time: 24
+              children:
+                - $formkit: group
+                  name: item
+                  children:
+                    - $formkit: text
+                      name: greeting
+                      label: 问候内容
+                      placeholder: 请输入问候内容
+                    - $formkit: text
+                      name: start_time
+                      label: 开始时间
+                      placeholder: 请输入开始时间(小时)
+                      help: 与上一个问候的结束时间相同时，上一个问候在该时间生效
+                    - $formkit: text
+                      name: end_time
+                      label: 结束时间
+                      placeholder: 请输入结束时间(小时)
+                      help: 可以与开始时间相同，表示一个小时内的问候

templates/index.html

@@ -8,7 +8,8 @@
 
         <header th:class="${theme.config.top.above.enable_above ? 'full_page' : 'not-top-img'}" id="page-header">
             <nav th:replace="~{modules/nav :: nav(title = null)}"></nav>
-
+            <!-- 问候语 -->
+            <th:block th:replace="~{modules/header/greeting :: greeting}"></th:block>
             <!-- 第一屏 -->
             <th:block th:replace="~{modules/header/index-img :: index-img}"></th:block>
         </header>

templates/modules/header/greeting.html

@@ -0,0 +1,98 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<!-- 第一屏 -->
+<th:block th:fragment="greeting">
+    <th:block th:if="${theme.config.other.greeting.enable_greeting}">
+        <div id="greetingBox"></div>
+        <style>
+            #greetingBox {
+                position: fixed;
+                top: 10px;
+                left: 15%;
+                width: 400px;
+                text-align: center;
+                z-index: 999;
+                pointer-events: none
+            }
+
+            #greeting {
+                display: inline-block;
+                position: relative;
+                opacity: 0;
+                top: -110px;
+                padding: 5px 40px;
+                border-radius: 50px;
+                background-color: #fff;
+                color: #000;
+                font-size: small;
+                transition: .5s;
+                box-shadow: rgb(0 0 0 / 5%) 0 10px 20px
+            }
+
+            #greeting.shown {
+                opacity: 1;
+                top: 0
+            }
+        </style>
+        <script th:inline="javascript">
+            (() => {
+                const greeting = [[${theme.config.other.greeting.setting}]].map((itme) => {
+                    return itme.realNode.item
+                })
+                let e = greeting.length !== 0 ? greeting : [
+                    {
+                        greeting: "晚安😴",
+                        start_time: 0,
+                        end_time: 5
+                    }, {
+                        greeting: "早上好鸭👋, 祝你一天好心情！",
+                        start_time: 6,
+                        end_time: 9
+                    }, {
+                        greeting: "上午好👋, 状态很好，鼓励一下～",
+                        start_time: 10,
+                        end_time: 10
+                    }, {
+                        greeting: "11点多啦, 在坚持一下就吃饭啦～",
+                        start_time: 11,
+                        end_time: 11
+                    }, {
+                        greeting: "午安👋, 宝贝",
+                        start_time: 12,
+                        end_time: 14
+                    }, {
+                        greeting: "🌈充实的一天辛苦啦！",
+                        start_time: 14,
+                        end_time: 18
+                    }, {
+                        greeting: "19点喽, 奖励一顿丰盛的大餐吧🍔。",
+                        start_time: 19,
+                        end_time: 19
+                    }, {
+                        greeting: "晚上好👋, 在属于自己的时间好好放松😌~",
+                        start_time: 20,
+                        end_time: 24
+                    }];
+                let t = document.createElement("div");
+                t.id = "greeting", setTimeout((() => {
+                    t.classList.add("shown")
+                }), 1e3);
+                let i = document.querySelector("#greetingBox");
+                i.appendChild(t);
+                const n = (new Date).getHours();
+                let r = "晚上好👋";
+                for (let t = 0; t < e.length; t++) if (n >= e[t].start_time && n <= e[t].end_time) {
+                    r = e[t].greeting;
+                    break
+                }
+                t.innerHTML = r, setTimeout((() => {
+                    t.classList.remove("shown"), setTimeout((() => {
+                        i.remove()
+                    }), 500)
+                }), 3e3)
+            })()
+        </script>
+    </th:block>
+</th:block>
+
+</html>

templates/modules/header/index-img.html

@@ -3,7 +3,6 @@
 <!-- 第一屏 -->
 <th:block th:fragment="index-img">
     <th:block th:if="${theme.config.top.above.enable_above}">
-        <div id="greetingBox"></div>
         <div class="pl-container">
             <div class="pl-img pl-blur pl-visible"></div>
             <div class="pl-img pl-visible"></div>
@@ -231,35 +230,6 @@
                     opacity: 1;
                 }
             }
-
-            #greetingBox {
-                position: fixed;
-                top: 10px;
-                left: 15%;
-                width: 400px;
-                text-align: center;
-                z-index: 999;
-                pointer-events: none
-            }
-
-            #greeting {
-                display: inline-block;
-                position: relative;
-                opacity: 0;
-                top: -110px;
-                padding: 5px 40px;
-                border-radius: 50px;
-                background-color: #fff;
-                color: #000;
-                font-size: small;
-                transition: .5s;
-                box-shadow: rgb(0 0 0 / 5%) 0 10px 20px
-            }
-
-            #greeting.shown {
-                opacity: 1;
-                top: 0
-            }
         </style>
         <script th:inline="javascript">
             function subtitleType() {
@@ -281,47 +251,6 @@
             }
             "function" == typeof Typed ? subtitleType() : getScript("https://npm.elemecdn.com/typed.js@2.0.12/lib/typed.min.js").then(subtitleType)
         </script>
-        <script>
-            (() => {
-                const e = [{greeting: "晚安😴", startTime: 0, endTime: 5}, {
-                    greeting: "早上好鸭👋, 祝你一天好心情！",
-                    startTime: 6,
-                    endTime: 9
-                }, {
-                    greeting: "上午好👋, 状态很好，鼓励一下～",
-                    startTime: 10,
-                    endTime: 10
-                }, {greeting: "11点多啦, 在坚持一下就吃饭啦～", startTime: 11, endTime: 11}, {
-                    greeting: "午安👋, 宝贝",
-                    startTime: 12,
-                    endTime: 14
-                }, {
-                    greeting: "🌈充实的一天辛苦啦！",
-                    startTime: 14,
-                    endTime: 18
-                }, {
-                    greeting: "19点喽, 奖励一顿丰盛的大餐吧🍔。",
-                    startTime: 19,
-                    endTime: 19
-                }, {greeting: "晚上好👋, 在属于自己的时间好好放松😌~", startTime: 20, endTime: 24}];
-                let t = document.createElement("div");
-                t.id = "greeting", setTimeout((() => {
-                    t.classList.add("shown")
-                }), 1e3);
-                let i = document.querySelector("#greetingBox");
-                i.appendChild(t);
-                const n = (new Date).getHours();
-                let r = "晚上好👋";
-                for (let t = 0; t < e.length; t++) if (n >= e[t].startTime && n <= e[t].endTime) {
-                    r = e[t].greeting;
-                    break
-                }
-                t.innerHTML = r, setTimeout((() => {
-                    t.classList.remove("shown"), setTimeout((() => {
-                        i.remove()
-                    }), 500)
-                }), 3e3)
-            })()</script>
     </th:block>
 </th:block>