From 39c1caca7d16f8a87ee3d90b4b6f1c6e3cd7c1b7 Mon Sep 17 00:00:00 2001 From: liuzhihang Date: Sun, 11 Dec 2022 15:05:41 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E4=BE=A7=E6=A0=8F=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E9=95=BF=E5=BA=A6=E8=AE=BE=E7=BD=AE=202.=20=E4=BE=A7=E6=A0=8F?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E9=95=BF=E5=BA=A6=E8=AE=BE=E7=BD=AE=203.=20?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=96=87=E7=AB=A0=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E6=A0=8F=E5=8F=8A=E5=85=B6=E4=BB=96=E8=B7=AF=E5=BE=84=204.=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=AC=E5=AE=89=E5=A4=87=E6=A1=88=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=205.=20fix=20=E4=B8=8D=E8=83=BD=E4=BF=AE=E6=94=B9=20b?= =?UTF-8?q?anner=20=E5=90=8D=E7=A7=B0=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 7 +- settings.yaml | 91 +++++++++++++++++- templates/assets/images/beian.png | Bin 0 -> 19256 bytes templates/category.html | 2 +- templates/index.html | 2 +- .../{category-bar.html => bar/category.html} | 4 +- templates/modules/bar/custom-category.html | 23 +++++ templates/modules/bar/custom-tag.html | 23 +++++ templates/modules/bar/custom-url.html | 23 +++++ templates/modules/bar/more.html | 13 +++ templates/modules/bar/tag.html | 23 +++++ templates/modules/footer.html | 6 +- .../modules/widgets/aside/categories.html | 11 ++- templates/modules/widgets/aside/tags.html | 6 +- theme.yaml | 2 +- 15 files changed, 217 insertions(+), 19 deletions(-) create mode 100644 templates/assets/images/beian.png rename templates/modules/{category-bar.html => bar/category.html} (83%) create mode 100644 templates/modules/bar/custom-category.html create mode 100644 templates/modules/bar/custom-tag.html create mode 100644 templates/modules/bar/custom-url.html create mode 100644 templates/modules/bar/more.html create mode 100644 templates/modules/bar/tag.html diff --git a/README.md b/README.md index 4806469a..6d54e732 100644 --- a/README.md +++ b/README.md @@ -11,9 +11,10 @@ 文档：[语雀](https://www.yuque.com/liuzhihangs/halo-theme-hao) -> Halo-Theme-Hao 是一款 [Halo2.0](https://github.com/halo-dev/halo) 的博客主题 -> -> 移植于 Hexo 社区 [hexo-theme-butterfly](https://github.com/jerryc127/hexo-theme-butterfly) 主题中 [Heo](https://blog.zhheo.com/) 的魔改 +> halo-theme-hao 是一款 [Halo2.0](https://github.com/halo-dev/halo) 的博客主题 +> +> 移植于 Hexo 社区 [hexo-theme-butterfly](https://github.com/jerryc127/hexo-theme-butterfly) +> 主题中 [Heo](https://blog.zhheo.com/) 的魔改 ## 安裝 diff --git a/settings.yaml b/settings.yaml index d4773a5d..ebb56e8c 100644 --- a/settings.yaml +++ b/settings.yaml @@ -15,6 +15,11 @@ spec: label: ICP 备案 placeholder: 请输入 ICP 备案号 help: "京ICP备xxxxxxxx号" + - $formkit: text + name: gongan + label: 公安备案 + placeholder: 请输入公安备案号 + help: "皖公网安备 xxxxxxxx号" - $formkit: url name: copyrightAgreement label: 版权协议 @@ -56,14 +61,14 @@ spec: value: true - label: 隐藏 value: false - - $formkit: text + - $formkit: textarea if: "$get(recentTop).value" name: bannersTitleBig label: Banners 大标题 placeholder: 请输入大标题 value: Halo Theme Hao help: 支持 HTML 语法 - - $formkit: text + - $formkit: textarea if: "$get(recentTop).value" name: bannersTitleSmall label: Banners 小标题 @@ -71,6 +76,7 @@ spec: value: 更多信息请关注 GitHub help: 支持 HTML 语法 - $formkit: select + if: "$get(recentTop).value" name: bannersBackground label: 文章列表布局 value: default @@ -173,9 +179,77 @@ spec: - group: layout label: 布局 formSchema: + - $formkit: select + name: nav + id: nav + key: nav + label: 文章导航 + value: category + options: + - label: 分类 + value: category + - label: 标签 + value: tag + # - label: 自定义分类 + # value: custom-category + # - label: 自定义标签 + # value: custom-tag + - label: 自定义路径 + value: custom-url + # - $formkit: repeater + # if: "$get(nav).value === 'custom-category'" + # name: navCustomCategory + # label: 自定义分类 + # value: [ ] + # children: + # - $formkit: categorySelect + # name: category + # label: 分类 + # - $formkit: repeater + # if: "$get(nav).value === 'custom-tag'" + # name: navCustomTag + # label: 自定义标签 + # value: [ ] + # children: + # - $formkit: tagSelect + # name: tag + # label: 标签 + - $formkit: repeater + if: "$get(nav).value === 'custom-url'" + name: navCustomUrl + label: 自定义路径 + value: [ ] + children: + - $formkit: text + name: title + label: 标题 + - $formkit: url + name: url + label: 链接 + - $formkit: select + name: navMore + id: navMore + key: navMore + label: 文章导航更多跳转地址 + value: hide + options: + - label: 隐藏 + value: hide + - label: 分类 + value: categories + - label: 标签 + value: tags + - label: 自定义地址 + value: customUrl + - $formkit: url + if: "$get(navMore).value === customUrl" + name: navMoreCustomUrl + label: 文章导航更多跳转路径 + value: + - $formkit: select name: cols - label: 文章列表布局 + label: 文章布局 value: col2 options: - label: 单列 @@ -332,7 +406,6 @@ spec: - $formkit: url name: url label: 链接 - validation: "url" - $formkit: radio name: urlType label: 链接类型 @@ -359,6 +432,16 @@ spec: placeholder: 公众号背面图 validation: "url" help: 图片可以从公众号后台下载物料或者自制 + - $formkit: number + name: tagQuantity + label: 标签数量 + value: -1 + help: "小于 0 则展示全部标签" + - $formkit: number + name: categoryQuantity + label: 目录数量 + value: -1 + help: "小于 0 则展示全部目录" - group: footer label: 页脚 diff --git a/templates/assets/images/beian.png b/templates/assets/images/beian.png new file mode 100644 index 0000000000000000000000000000000000000000..9f763946dd6606addeab24e40e2369124d53a048 GIT binary patch literal 19256 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 literal 0 HcmV?d00001 diff --git a/templates/category.html b/templates/category.html index f6fac7c4..f3427ff7 100644 --- a/templates/category.html +++ b/templates/category.html @@ -26,7 +26,7 @@ - + 更多
diff --git a/templates/index.html b/templates/index.html index b99a7295..1b17ad3d 100644 --- a/templates/index.html +++ b/templates/index.html @@ -19,7 +19,7 @@
-
+
diff --git a/templates/modules/category-bar.html b/templates/modules/bar/category.html similarity index 83% rename from templates/modules/category-bar.html rename to templates/modules/bar/category.html index cd4a58ed..ad66c460 100644 --- a/templates/modules/category-bar.html +++ b/templates/modules/bar/category.html @@ -1,7 +1,7 @@ -
+
首页 @@ -17,7 +17,7 @@
- 更多 + 更多
\ No newline at end of file diff --git a/templates/modules/bar/custom-category.html b/templates/modules/bar/custom-category.html new file mode 100644 index 00000000..d6b81e3f --- /dev/null +++ b/templates/modules/bar/custom-category.html @@ -0,0 +1,23 @@ + + + +
+
+
+ 首页 +
+ + + +
+ + +
+ + +
+ 更多 +
+ + \ No newline at end of file diff --git a/templates/modules/bar/custom-tag.html b/templates/modules/bar/custom-tag.html new file mode 100644 index 00000000..0b44ae65 --- /dev/null +++ b/templates/modules/bar/custom-tag.html @@ -0,0 +1,23 @@ + + + +
+
+
+ 首页 +
+ + + +
+ +
+ + +
+ 更多 +
+ + \ No newline at end of file diff --git a/templates/modules/bar/custom-url.html b/templates/modules/bar/custom-url.html new file mode 100644 index 00000000..b0842756 --- /dev/null +++ b/templates/modules/bar/custom-url.html @@ -0,0 +1,23 @@ + + + +
+
+
+ 首页 +
+ + + +
+ +
+ + +
+ 更多 +
+ + \ No newline at end of file diff --git a/templates/modules/bar/more.html b/templates/modules/bar/more.html new file mode 100644 index 00000000..84311a45 --- /dev/null +++ b/templates/modules/bar/more.html @@ -0,0 +1,13 @@ + + + + + 更多 + 更多 + 更多 + + + \ No newline at end of file diff --git a/templates/modules/bar/tag.html b/templates/modules/bar/tag.html new file mode 100644 index 00000000..a510e3aa --- /dev/null +++ b/templates/modules/bar/tag.html @@ -0,0 +1,23 @@ + + + +
+
+
+ 首页 +
+ + + +
+ +
+ + +
+ 更多 +
+ + \ No newline at end of file diff --git a/templates/modules/footer.html b/templates/modules/footer.html index 1f1909c6..c49b3394 100644 --- a/templates/modules/footer.html +++ b/templates/modules/footer.html @@ -52,12 +52,16 @@
- 订阅 + 订阅 主题 关于 [[${theme.config.basics.icp}]] + [[${theme.config.basics.gongan}]] + -
+
分类