From 7c2ab47429bb8923164a47ff1189352defa07f5d Mon Sep 17 00:00:00 2001 From: -LiaNg- Date: Mon, 26 Aug 2019 14:59:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=9B=9E=E8=BD=A6=E9=94=AE=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/static/ruoyi/js/ry-ui.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 df53d3c0f..bf39ab35c 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 @@ -1360,4 +1360,16 @@ modal_status = { SUCCESS: "success", FAIL: "error", WARNING: "warning" +}; + +document.onkeydown = function (event) { + var e = event ? event : (window.event ? window.event : null); + if (e.keyCode === 13) { + var hasTable = document.getElementById("bootstrap-table"); + if (hasTable == null) { + return true; + } + $.table.search(); + return false; + } }; \ No newline at end of file -- Gitee From 09f85e60f422fb15db0219bd21ab5362ce532307 Mon Sep 17 00:00:00 2001 From: -LiaNg- Date: Mon, 26 Aug 2019 15:06:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=9B=9E=E8=BD=A6=E9=94=AE=E6=90=9C=E7=B4=A2?= 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 bf39ab35c..00df79530 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 @@ -1363,7 +1363,7 @@ modal_status = { }; document.onkeydown = function (event) { - var e = event ? event : (window.event ? window.event : null); + var e = e || window.event; if (e.keyCode === 13) { var hasTable = document.getElementById("bootstrap-table"); if (hasTable == null) { -- Gitee