From 6cda301f43b4e3b96d870fd583c34879cdcac94b Mon Sep 17 00:00:00 2001 From: RuoYi Date: Thu, 15 Nov 2018 13:35:41 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=89=E9=A1=B9=E5=8D=A1=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=85=A8=E5=B1=8F=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/static/ruoyi/index.js | 20 ++++++++++++++++++- .../src/main/resources/templates/index.html | 2 ++ .../resources/templates/system/role/rule.html | 3 +-- .../main/resources/vm/java/Controller.java.vm | 2 +- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/index.js b/ruoyi-admin/src/main/resources/static/ruoyi/index.js index fb5501c4b..2d2b1e8da 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/index.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/index.js @@ -370,7 +370,8 @@ $(function() { // 刷新按钮 $('.tabReload').on('click', refreshTab); - $('.menuTabs').on('dblclick', '.menuTab', refreshTab); + // 双击选项卡全屏显示 + $('.menuTabs').on('dblclick', '.menuTab', activeTabMax); // 左移按扭 $('.tabLeft').on('click', scrollTabLeft); @@ -396,4 +397,21 @@ $(function() { $('.page-tabs-content').css("margin-left", "0"); }); + // tab全屏显示 + $('.tabMaxCurrent').on('click', function () { + $('.page-tabs-content').find('.active').trigger("dblclick"); + }); + + // 双击选项卡全屏显示 + function activeTabMax() { + $('#content-main').toggleClass('max'); + $('#ax_close_max').show(); + } + + $(window).keydown(function(event) { + if (event.keyCode == 27) { + $('#content-main').removeClass('max'); + $('#ax_close_max').hide(); + } + }); }); \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html index 3a1baf66c..b8a369b62 100644 --- a/ruoyi-admin/src/main/resources/templates/index.html +++ b/ruoyi-admin/src/main/resources/templates/index.html @@ -18,6 +18,7 @@ @@ -115,6 +116,7 @@
  • 关闭当前
  • 关闭其他
  • 全部关闭
    • +
  • 全屏显示
    • 刷新 diff --git a/ruoyi-admin/src/main/resources/templates/system/role/rule.html b/ruoyi-admin/src/main/resources/templates/system/role/rule.html index 745f7f2c3..6fd50abc8 100644 --- a/ruoyi-admin/src/main/resources/templates/system/role/rule.html +++ b/ruoyi-admin/src/main/resources/templates/system/role/rule.html @@ -29,7 +29,7 @@ 特殊情况下，设置为“自定数据权限” -