From c813f905ce5339f8ea1f8309b75b488df3134204 Mon Sep 17 00:00:00 2001
From: wanggeng <450292408@qq.com>
Date: Fri, 8 Jul 2022 09:31:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=86=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../login/base/controller/route/IndexRouteController.java   | 2 +-
 login-base/src/main/resources/templates/default-main.html   | 6 +++---
 .../src/main/resources/templates/login/form/save.html       | 3 +++
 .../src/main/resources/templates/login/form/update.html     | 3 +++
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/login-base/src/main/java/ink/wgink/login/base/controller/route/IndexRouteController.java b/login-base/src/main/java/ink/wgink/login/base/controller/route/IndexRouteController.java
index e5191540..95462057 100644
--- a/login-base/src/main/java/ink/wgink/login/base/controller/route/IndexRouteController.java
+++ b/login-base/src/main/java/ink/wgink/login/base/controller/route/IndexRouteController.java
@@ -68,7 +68,7 @@ public class IndexRouteController {
     public ModelAndView defaultMain(@PathVariable("menuIdAndDefaultHome") String menuIdAndDefaultHome) {
         ModelAndView mv = new ModelAndView("default-main");
         UserInfoBO userInfoBO = securityComponent.getCurrentUser();
-        mv.addObject("userUsername", userInfoBO.getUserUsername());
+        mv.addObject("userName", userInfoBO.getUserName());
         Map<String, String> config = ConfigManager.getInstance().getConfig();
         // 先加载系统短标题，没有加载主标题，没有加载配置文件系统标题
         if (!StringUtils.isBlank(config.get(IUserCenterConst.SYSTEM_SHORT_TITLE))) {
diff --git a/login-base/src/main/resources/templates/default-main.html b/login-base/src/main/resources/templates/default-main.html
index 551f02f4..1dc40a9d 100644
--- a/login-base/src/main/resources/templates/default-main.html
+++ b/login-base/src/main/resources/templates/default-main.html
@@ -14,8 +14,8 @@
     <link rel="stylesheet" href="assets/layuiadmin/style/default-main.css" media="all">
     <style>
         .system-nav-box {}
-        .system-nav-box .system-box {display:none;background-color: #fff;width: 310px;position: absolute;top: 50px;left: -50px;border: 1px solid #f6f6f6; overflow: hidden;}
-        .system-nav-box .system-box .system-item-list {width: 330px; max-height: 310px; overflow: auto; padding-bottom: 10px;}
+        .system-nav-box .system-box {display:none;background-color: #fff; max-width: 310px;position: absolute;top: 50px;left: -50px;border: 1px solid #f6f6f6; overflow: hidden;}
+        .system-nav-box .system-box .system-item-list {max-width: 330px; max-height: 310px; overflow: auto; padding-bottom: 10px;}
         .system-nav-box .system-box .system-item-list .system-item {background-color: red; color: #FFF; text-align: left; width: 60px; height: 60px; margin-left: 10px; margin-top: 10px; padding: 15px;border-bottom: 1px solid #f6f6f6; float: left}
         .system-nav-box .system-box .system-item-list .system-item .icon {text-align: center; line-height: 40px;}
         .system-nav-box .system-box .system-item-list .system-item .icon i{font-size: 30px;}
@@ -90,7 +90,7 @@
                 </li>
                 <li class="layui-nav-item" lay-unselect>
                     <a href="javascript:void(0);">
-                        <cite th:text="${userUsername}"></cite>
+                        <cite th:text="${userName}"></cite>
                     </a>
                     <dl class="layui-nav-child">
                         <dd><a id="LAY-changePassword" lay-href="javascript:void(0);">修改密码</a></dd>
diff --git a/login-base/src/main/resources/templates/login/form/save.html b/login-base/src/main/resources/templates/login/form/save.html
index 928eac5c..7958a76b 100644
--- a/login-base/src/main/resources/templates/login/form/save.html
+++ b/login-base/src/main/resources/templates/login/form/save.html
@@ -16,6 +16,7 @@
         .resource-img, .resource-img-path {text-align: center}
         .layui-btn-container .layui-btn {margin-bottom: 0px}
         .layui-table {width: auto;}
+        .CodeMirror {font-size : 13px;line-height: 150%;}
     </style>
 </head>
 <body>
@@ -375,6 +376,8 @@
             theme: 'dracula',
             matchBrackets: true,
             indentUnit : 4,
+            indentWithTabs: 4,
+            flattenSpans: false,
             tabSize : 4,
             extraKeys: {
                 'Shift-Tab': function (cm) {
diff --git a/login-base/src/main/resources/templates/login/form/update.html b/login-base/src/main/resources/templates/login/form/update.html
index dffe93d0..29a49772 100644
--- a/login-base/src/main/resources/templates/login/form/update.html
+++ b/login-base/src/main/resources/templates/login/form/update.html
@@ -16,6 +16,7 @@
         .resource-img, .resource-img-path {text-align: center}
         .layui-btn-container .layui-btn {margin-bottom: 0px}
         .layui-table {width: auto;}
+        .CodeMirror {font-size : 13px;line-height: 150%;}
     </style>
 </head>
 <body>
@@ -377,6 +378,8 @@
             theme: 'dracula',
             matchBrackets: true,
             indentUnit : 4,
+            indentWithTabs: 4,
+            flattenSpans: false,
             tabSize : 4,
             extraKeys: {
                 'Shift-Tab': function (cm) {