From 33df1fa37cbdefff0a6dcd899475cbe0857fadb8 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Tue, 9 Jan 2024 16:43:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0vue=E6=97=A0=E6=A1=86?=
 =?UTF-8?q?=E6=9E=B6=E9=A1=B5=E9=9D=A2=E7=9A=84=E7=BB=84=E4=BB=B6=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jeesite/modules/sys/web/LoginController.java | 5 ++---
 .../src/main/resources/views/modules/sys/menuForm.html    | 8 +++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java
index afee8049..f02cc71d 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java
@@ -107,9 +107,8 @@ public class LoginController extends BaseController{
 	 */
 	@RequestMapping(value = "loginFailure")
 	public String loginFailure(HttpServletRequest request, HttpServletResponse response, Model model) {
-		LoginInfo loginInfo = UserUtils.getLoginInfo();
-		
-		// 如果已经登录，则跳转到管理首页
+//		// 如果已经登录，则跳转到管理首页
+//		LoginInfo loginInfo = UserUtils.getLoginInfo();
 //		if(loginInfo != null){ // 注释掉，已经登录的账号，正常返回登录失败信息，方便前端判断。
 //			String queryString = request.getQueryString();
 //			queryString = queryString == null ? "" : "?" + queryString;
diff --git a/modules/core/src/main/resources/views/modules/sys/menuForm.html b/modules/core/src/main/resources/views/modules/sys/menuForm.html
index ce22ed8c..d100e7f3 100644
--- a/modules/core/src/main/resources/views/modules/sys/menuForm.html
+++ b/modules/core/src/main/resources/views/modules/sys/menuForm.html
@@ -118,9 +118,10 @@
 							<label class="control-label col-sm-4" title="设置 vue 组件名称，一般不需要填写，默认是根据 “链接地址” 进行自动生成，
 只有个性化的时候才需要设置，如果填写 IFRAME 则强制使用 iframe 打开链接；
 如果填写 LAYOUT 将不在 Beetl 视图中显示菜单项
-如果填写 BEETL 则只在 Beetl 视图中显示菜单项">${text('组件名称')}：<i class="fa icon-question hide"></i></label>
+如果填写 BEETL 则只在 Beetl 视图中显示菜单项
+如果填写 BLANK 则无主框架（仅顶部菜单设置）">${text('组件名称')}：<i class="fa icon-question "></i></label>
 							<div class="col-sm-8">
-								<#form:input path="component" maxlength="9" class="form-control "/>
+								<#form:input path="component" maxlength="200" class="form-control "/>
 							</div>
 						</div>
 					</div>
@@ -138,7 +139,8 @@
 				<div class="row">
 					<div class="col-xs-6">
 						<div class="form-group">
-							<label class="control-label col-sm-4">${text('排序(升序)')}：</label>
+							<label class="control-label col-sm-4" title="升序，当前级别的排序号">
+								${text('排序号')}：<i class="fa icon-question"></i></label>
 							<div class="col-sm-8">
 								<#form:input path="treeSort" maxlength="9" class="form-control required"/>
 							</div>