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 81f38b7..1476d21 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 @@ -176,11 +176,21 @@ window.open(src); } }); - // 单击tooltip复制文本 + // 单击tooltip事件 $.btTable.on('click', '.tooltip-show', function() { - var input = $(this).prev(); - input.select(); - document.execCommand("copy"); + var target = $(this).data('target'); + var input = $(this).prev(); + if ($.common.equals("0", target)) { + input.select(); + document.execCommand("copy"); + } else if ($.common.equals("1", target)) { + parent.layer.alert(input.val(), { + title: "信息内容", + shadeClose: true, + btn: ['确认'], + btnclass: ['btn btn-primary'], + }); + } }); }, // 当所有数据被加载时触发 @@ -203,17 +213,18 @@ var pageNumber = table.pageNumber; return pageSize * (pageNumber - 1) + index + 1; }, - // 列超出指定长度浮动提示(单击文本复制) - tooltip: function (value, length) { + // 列超出指定长度浮动提示(target=0单击文本复制,不弹窗,target=1弹窗打开) + tooltip: function (value, length, target) { var _length = $.common.isEmpty(length) ? 20 : length; var _text = ""; var _value = $.common.nullToStr(value); + var _target = $.common.isEmpty(target) ? '0' : target; if (_value.length > _length) { _text = _value.substr(0, _length) + "..."; _value = _value.replace(/\'/g,"’"); var actions = []; actions.push($.common.sprintf('', _value)); - actions.push($.common.sprintf("%s", _value, _text)); + actions.push($.common.sprintf("%s", _target, _value, _text)); return actions.join(''); } else { _text = _value; diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html index 973df25..9682c66 100644 --- a/ruoyi-admin/src/main/resources/templates/index.html +++ b/ruoyi-admin/src/main/resources/templates/index.html @@ -262,7 +262,7 @@ /* 用户管理-重置密码 */ function resetPwd() { var url = ctx + 'system/user/profile/resetPwd'; - $.modal.open("重置密码", url, '800', '500'); + $.modal.open("重置密码", url, '770', '380'); } /* 切换主题 */ function switchSkin() { diff --git a/ruoyi-admin/src/main/resources/templates/system/config/config.html b/ruoyi-admin/src/main/resources/templates/system/config/config.html index 4a68626..ac88d0b 100644 --- a/ruoyi-admin/src/main/resources/templates/system/config/config.html +++ b/ruoyi-admin/src/main/resources/templates/system/config/config.html @@ -82,12 +82,18 @@ }, { field: 'configName', - title: '参数名称' - }, + title: '参数名称', + formatter: function(value, row, index) { + return $.table.tooltip(value); + } + }, { field: 'configKey', - title: '参数键名' - }, + title: '参数键名', + formatter: function(value, row, index) { + return $.table.tooltip(value); + } + }, { field: 'configValue', title: '参数键值' @@ -105,7 +111,7 @@ title: '备注', align: 'center', formatter: function(value, row, index) { - return $.table.tooltip(value); + return $.table.tooltip(value, 10, 1); } }, {