From fe4677bcf51d2714e1aa1eee0a3b2c59eca45d41 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Fri, 15 Feb 2019 16:07:25 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E7=A6=81=E7=94=A8?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/static/ruoyi/js/ry-ui.js       | 11 ++++++-----
 ruoyi-admin/src/main/resources/templates/login.html   |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
index 9162edd1a..5150143cc 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
@@ -99,12 +99,13 @@
 			tooltip: function (value, length) {
 				var _length = $.common.isEmpty(length) ? 20 : length;
 				var _text = "";
-				if ($.common.isNotEmpty(value) && value.length > _length) {
-					_text = value.substr(0, _length) + "...";
+				var _value = $.common.nullToStr(value);
+				if (_value.length > _length) {
+					_text = _value.substr(0, _length) + "...";
 				} else {
-					_text = $.common.nullToStr(value);
+					_text = _value;
 				}
-				return '<a href="#" class="tooltip-show" data-toggle="tooltip" title="' + value + '">' + _text +'</a>';
+				return '<a href="#" class="tooltip-show" data-toggle="tooltip" title="' + _value + '">' + _text +'</a>';
 			},
             // 搜索-默认第一个form
             search: function(formId) {
@@ -918,7 +919,7 @@
             // 空对象转字符串
             nullToStr: function(value) {
                 if ($.common.isEmpty(value)) {
-                    return '-'
+                    return "-";
                 }
                 return value;
             },
diff --git a/ruoyi-admin/src/main/resources/templates/login.html b/ruoyi-admin/src/main/resources/templates/login.html
index 27ee765a5..2bddf4512 100644
--- a/ruoyi-admin/src/main/resources/templates/login.html
+++ b/ruoyi-admin/src/main/resources/templates/login.html
@@ -51,7 +51,7 @@
                     <input type="password" name="password" class="form-control pword"     placeholder="密码"   value="admin123" />
 					<div class="row m-t" th:if="${captchaEnabled==true}">
 						<div class="col-xs-6">
-						    <input type="text" name="validateCode" class="form-control code" placeholder="验证码" maxlength="5">
+						    <input type="text" name="validateCode" class="form-control code" placeholder="验证码" maxlength="5" autocomplete="off">
 						</div>
 						<div class="col-xs-6">
 							<a href="javascript:void(0);" title="点击更换验证码">