调整导航栏代码，调整 settings 文件

2022-10-13 23:15:40 +08:00 · 2022-10-13 23:15:40 +08:00 · e2fdde76ad
parent 403c828696
commit e2fdde76ad
4 changed files with 11 additions and 10 deletions
--- a/http/http-client.env.json
+++ b/http/http-client.env.json
@ -1,6 +1,6 @@
 {
  "dev": {
    "cookie": "mozi-assist={\"show\":false,\"audio\":false,\"speed\":\"middle\",\"zomm\":1,\"cursor\":false,\"pointer\":false,\"bigtext\":false,\"overead\":false}; SESSION=dc56cf1a-7f74-4148-af2f-d8bde7dec653; XSRF-TOKEN=acab263c-7605-4765-873e-d0810c6d6973s",
-    "token": "acab263c-7605-4765-873e-d0810c6d6973"
+    "token": "acab263c-7605-4765-873e-d0810c6d6973s"
  }
 }
--- a/http/settings.http
+++ b/http/settings.http
@ -3,7 +3,7 @@
 DELETE http://localhost:8090/api/v1alpha1/settings/theme-hao-setting
 Content-Type: application/json
 Sec-Fetch-Mode: cors
-X-XSRF-TOKEN: {{$uuid}}
+X-XSRF-TOKEN: {{token}}
 Cookie: {{cookie}}


@ -13,7 +13,7 @@ POST http://localhost:8090/api/v1alpha1/settings
 Content-Type: application/json
 Sec-Fetch-Mode: cors
 Cookie: {{cookie}}
-X-XSRF-TOKEN: {{$uuid}}
+X-XSRF-TOKEN: {{token}}

 {
  "apiVersion": "v1alpha1",
@ -167,12 +167,12 @@ X-XSRF-TOKEN: {{$uuid}}
        ]
      },
      {
-        "group": "menu",
+        "group": "footer",
        "label": "菜单映射",
        "formSchema": [
          {
            "$formkit": "text",
-            "name": "footer_menu",
+            "name": "menu",
            "label": "底部相关链接",
            "placeholder": "请填写 metadata name",
            "help": "需要通过开发者模式获取菜单对应的 metadata name"
--- a/settings.yaml
+++ b/settings.yaml
@ -89,7 +89,7 @@ spec:
          placeholder: 请填写个人卡片描述信息
          help: "支持使用 HTML 标签"
    - group: footer
-      label: 菜单映射
+      label: 页脚
      formSchema:
        - $formkit: text
          name: menu
--- a/templates/modules/footer.html
+++ b/templates/modules/footer.html
@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 页脚模块 -->
-<footer id="footer" th:fragment="footer" th:with="footMenu = ${theme.config.menu.footer_menu}">
+<footer id="footer" th:fragment="footer">

    <!-- 社交链接 -->
    <div id="footer_deal">
@ -39,8 +39,9 @@


    <!-- 相关地址  -->
-    <th:block th:if="${not #strings.isEmpty(footMenu)} and ${not #lists.isEmpty(menuFinder.getByName(footMenu))}">
-        <div id="heo-footer">
+    <th:block th:with="footMenu = ${theme.config.footer.menu}">
+        <div id="heo-footer"
+             th:if="${not #strings.isEmpty(footMenu)} and ${not #lists.isEmpty(menuFinder.getByName(footMenu))}">
            <div class="footer-group" th:each="menuItem : ${menuFinder.getByName(footMenu).menuItems}">
                <h3 class="footer-title" th:text="${menuItem.status.displayName}">软件</h3>
                <div class="footer-links">