From a3e946b57e559a66f0a9650d46737aa59dac7691 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Fri, 18 Oct 2019 17:59:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=AE=E5=8A=A8=E6=8F=90=E7=A4=BA=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95tooltip=E6=94=AF=E6=8C=81=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js   | 8 ++++----
 .../main/resources/templates/system/config/config.html    | 2 +-
 2 files changed, 5 insertions(+), 5 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 e91fa2453..2e5bfcf66 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
@@ -181,10 +181,10 @@
             	$.btTable.on('click', '.tooltip-show', function() {
             		var target = $(this).data('target');
             		var input = $(this).prev();
-            		if ($.common.equals("0", target)) {
+            		if ($.common.equals("copy", target)) {
             		    input.select();
             		    document.execCommand("copy");
-            		} else if ($.common.equals("1", target)) {
+            		} else if ($.common.equals("open", target)) {
             			parent.layer.alert(input.val(), {
                 	        title: "信息内容",
                 	        shadeClose: true,
@@ -214,12 +214,12 @@
 				var pageNumber = table.pageNumber;
 				return pageSize * (pageNumber - 1) + index + 1;
 			},
-			// 列超出指定长度浮动提示（target=0单击文本复制，不弹窗，target=1弹窗打开）
+			// 列超出指定长度浮动提示 target（copy单击复制文本 open弹窗打开文本）
 			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;
+				var _target = $.common.isEmpty(target) ? 'copy' : target;
 				if (_value.length > _length) {
 					_text = _value.substr(0, _length) + "...";
 					_value = _value.replace(/\'/g,"’");
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 aa3b4334c..833c2beab 100644
--- a/ruoyi-admin/src/main/resources/templates/system/config/config.html
+++ b/ruoyi-admin/src/main/resources/templates/system/config/config.html
@@ -111,7 +111,7 @@
                     title: '备注',
                     align: 'center',
                     formatter: function(value, row, index) {
-                    	return $.table.tooltip(value, 10, 1);
+                    	return $.table.tooltip(value, 10, "open");
                     }
                 },
                 {