diff --git a/package.json b/package.json index 1fa76fa9..1993d3ed 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "halo-theme-hao", - "version": "1.0.2", + "version": "1.0.3", "dependencies": { } } diff --git a/settings.yaml b/settings.yaml index ebb56e8c..8f8e2be7 100644 --- a/settings.yaml +++ b/settings.yaml @@ -190,30 +190,30 @@ spec: value: category - label: 标签 value: tag - # - label: 自定义分类 - # value: custom-category - # - label: 自定义标签 - # value: custom-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-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 @@ -439,9 +439,9 @@ spec: help: "小于 0 则展示全部标签" - $formkit: number name: categoryQuantity - label: 目录数量 + label: 分类数量 value: -1 - help: "小于 0 则展示全部目录" + help: "小于 0 则展示全部分类" - group: footer label: 页脚 diff --git a/templates/modules/bar/custom-category.html b/templates/modules/bar/custom-category.html index d6b81e3f..5176e353 100644 --- a/templates/modules/bar/custom-category.html +++ b/templates/modules/bar/custom-category.html @@ -1,21 +1,20 @@ -
+
- - +
- - + th:each="categoryItem : ${categoryFinder.getByName(customCategory.category)}" + th:id="${categoryItem.spec.displayName}"> +
- +
更多
diff --git a/templates/modules/bar/custom-tag.html b/templates/modules/bar/custom-tag.html index 0b44ae65..6de9eb51 100644 --- a/templates/modules/bar/custom-tag.html +++ b/templates/modules/bar/custom-tag.html @@ -7,15 +7,14 @@ 首页
- - +
- + 更多 diff --git a/theme.yaml b/theme.yaml index e5edff3d..bf594fb9 100644 --- a/theme.yaml +++ b/theme.yaml @@ -13,5 +13,5 @@ spec: repo: 'https://github.com/liuzhihang/halo-theme-hao' settingName: "theme-hao-setting" configMapName: "theme-hao-configMap" - version: 1.0.2 + version: 1.0.3 require: 2.0.0