From 24a5fcc635bb6b90e86d53cd836f316cd0246d2f Mon Sep 17 00:00:00 2001
From: j m <1406993111@qq.com>
Date: Sun, 29 Dec 2024 09:16:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=94=AF=E6=8C=81=E9=85=8D?=
=?UTF-8?q?=E7=BD=AE=E9=94=99=E8=AF=AF=E9=A1=B5=E9=A3=8E=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
settings.yaml | 36 +-
templates/error/4xx/error_train.html | 3 +-
templates/error/5xx/error_train.html | 428 ++++++++++++++++++
.../{4xx => common}/error_blue_screen.html | 26 +-
.../error/{4xx => common}/error_concise.html | 12 +-
templates/error/common/error_custom.html | 4 +
.../{4xx => common}/error_tv_screen.html | 5 +-
7 files changed, 487 insertions(+), 27 deletions(-)
create mode 100644 templates/error/5xx/error_train.html
rename templates/error/{4xx => common}/error_blue_screen.html (99%)
rename templates/error/{4xx => common}/error_concise.html (82%)
create mode 100644 templates/error/common/error_custom.html
rename templates/error/{4xx => common}/error_tv_screen.html (96%)
diff --git a/settings.yaml b/settings.yaml
index 638f199..c5eee06 100644
--- a/settings.yaml
+++ b/settings.yaml
@@ -1347,27 +1347,57 @@ spec:
style_5xx: 'error/common/error_default'
children:
- $formkit: select
+ id: style_4xx
name: style_4xx
label: 4xx错误页面风格
help: '发生4xx错误页面风格，如：404等。'
options:
- - value: 'error/4xx/error_blue_screen'
+ - value: 'error/common/error_blue_screen'
label: 蓝屏代码
- - value: 'error/4xx/error_tv_screen'
+ - value: 'error/common/error_tv_screen'
label: 电视雪花屏幕
- value: 'error/4xx/error_train'
label: 小火车
- - value: 'error/4xx/error_concise'
+ - value: 'error/common/error_concise'
label: 简洁
- value: 'error/common/error_default'
label: 默认
+ - value: 'error/common/error_custom'
+ label: 自定义
+ - $formkit: code
+ name: html_content_4xx
+ if: $get(style_4xx).value === 'error/common/error_custom'
+ validation: required
+ label: 自定义4xx错误页面内容
+ language: html
+ height: 45px
+ help: '填写页面内容，填写、和标签内容。'
- $formkit: select
name: style_5xx
+ id: style_5xx
label: 5xx错误页面风格
help: '发生5xx错误页面风格，如：500等。'
options:
+ - value: 'error/common/error_blue_screen'
+ label: 蓝屏代码
+ - value: 'error/common/error_tv_screen'
+ label: 电视雪花屏幕
+ - value: 'error/5xx/error_train'
+ label: 小火车
+ - value: 'error/common/error_concise'
+ label: 简洁
- value: 'error/common/error_default'
label: 默认
+ - value: 'error/common/error_custom'
+ label: 自定义
+ - $formkit: code
+ name: html_content_5xx
+ if: $get(style_5xx).value === 'error/common/error_custom'
+ validation: required
+ label: 自定义5xx错误页面内容
+ language: html
+ height: 45px
+ help: '填写页面内容，填写、和标签内容。'
- $formkit: radio
name: effects_lantern_mode
id: effects_lantern_mode
diff --git a/templates/error/4xx/error_train.html b/templates/error/4xx/error_train.html
index 56f4255..5d373ff 100644
--- a/templates/error/4xx/error_train.html
+++ b/templates/error/4xx/error_train.html
@@ -4,7 +4,8 @@
- 404 Not Found
+ [[${error.status + ' - ' + #strings.defaultString(error.title, 'Internal server error')}]]
+
+
+
+
+
+
+
+