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 9162edd1..5150143c 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 '' + _text +''; + return '' + _text +''; }, // 搜索-默认第一个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 27ee765a..2bddf451 100644 --- a/ruoyi-admin/src/main/resources/templates/login.html +++ b/ruoyi-admin/src/main/resources/templates/login.html @@ -51,7 +51,7 @@
- +