Merge pull request #312 from Roozenlz/main

修复问候语默认配置不显示
This commit is contained in:
困困鱼 2023-07-23 18:51:45 +08:00 committed by GitHub
commit d738a86e1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 18 deletions

View File

@ -2411,20 +2411,17 @@ spec:
start_time: 20 start_time: 20
end_time: 24 end_time: 24
children: children:
- $formkit: group - $formkit: text
name: item name: greeting
children: label: 问候内容
- $formkit: text placeholder: 请输入问候内容
name: greeting - $formkit: text
label: 问候内容 name: start_time
placeholder: 请输入问候内容 label: 开始时间
- $formkit: text placeholder: 请输入开始时间(小时)
name: start_time help: 与上一个问候的结束时间相同时,上一个问候在该时间生效
label: 开始时间 - $formkit: text
placeholder: 请输入开始时间(小时) name: end_time
help: 与上一个问候的结束时间相同时,上一个问候在该时间生效 label: 结束时间
- $formkit: text placeholder: 请输入结束时间(小时)
name: end_time help: 可以与开始时间相同,表示一个小时内的问候
label: 结束时间
placeholder: 请输入结束时间(小时)
help: 可以与开始时间相同,表示一个小时内的问候

View File

@ -37,7 +37,7 @@
<script th:inline="javascript"> <script th:inline="javascript">
(() => { (() => {
const greeting = [[${theme.config.other.greeting.setting}]].map((itme) => { const greeting = [[${theme.config.other.greeting.setting}]].map((itme) => {
return itme.realNode.item return itme.realNode
}) })
let e = greeting.length !== 0 ? greeting : [ let e = greeting.length !== 0 ? greeting : [
{ {