From 7e1d0e94d6149027f9be584b0b049b60b390668f Mon Sep 17 00:00:00 2001 From: sxile <3440626@qq.com> Date: Tue, 12 Nov 2019 14:06:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E6=A8=A1=E7=B3=8A=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/static/ruoyi/css/ry-ui.css | 14 +++++++++++ .../src/main/resources/templates/index.html | 6 ++--- .../generator/controller/GenController.java | 6 +++-- .../resources/templates/tool/gen/gen.html | 25 ++++++++++++++----- .../templates/tool/gen/importTable.html | 24 ++++++++++++++---- 5 files changed, 59 insertions(+), 16 deletions(-) diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css b/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css index f3186f0..2f10beb 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css +++ b/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css @@ -737,6 +737,20 @@ label { background-color: #12889a } +.select-list .select2-container--bootstrap { + width: 200px!important; + display: inline-block; +} + +.select-list .select2-container--bootstrap .select2-selection { + border-radius: 6px; +} + +.select-list .select2-container--bootstrap .select2-selection--single { + height: 30px!important; + padding: 5px 10px; +} + .select-list .select-time input { width: 93px; } diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html index 5be7667..973df25 100644 --- a/ruoyi-admin/src/main/resources/templates/index.html +++ b/ruoyi-admin/src/main/resources/templates/index.html @@ -47,10 +47,10 @@ -
  • - 主页 +
  • + 主页
  • diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java index 6e4f710..33b1103 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java @@ -46,8 +46,9 @@ public class GenController extends BaseController @RequiresPermissions("tool:gen:view") @GetMapping() - public String gen() + public String gen(ModelMap mmap) { + mmap.put("genTables", genTableService.selectGenTableList(new GenTable())); return prefix + "/gen"; } @@ -97,8 +98,9 @@ public class GenController extends BaseController */ @RequiresPermissions("tool:gen:list") @GetMapping("/importTable") - public String importTable() + public String importTable(ModelMap mmap) { + mmap.put("dbTables", genTableService.selectDbTableList(new GenTable())); return prefix + "/importTable"; } diff --git a/ruoyi-generator/src/main/resources/templates/tool/gen/gen.html b/ruoyi-generator/src/main/resources/templates/tool/gen/gen.html index 2591d68..6e01a50 100644 --- a/ruoyi-generator/src/main/resources/templates/tool/gen/gen.html +++ b/ruoyi-generator/src/main/resources/templates/tool/gen/gen.html @@ -1,7 +1,7 @@ - +
    @@ -11,11 +11,17 @@
    • - 表名称： -
      • + 表名称： +
    • - 表描述： -
      • + 表描述： +
    • @@ -24,7 +30,7 @@
    •  搜索 -  重置 +  重置
    @@ -52,6 +58,7 @@
    + \ No newline at end of file diff --git a/ruoyi-generator/src/main/resources/templates/tool/gen/importTable.html b/ruoyi-generator/src/main/resources/templates/tool/gen/importTable.html index a5e9e4d..021adfb 100644 --- a/ruoyi-generator/src/main/resources/templates/tool/gen/importTable.html +++ b/ruoyi-generator/src/main/resources/templates/tool/gen/importTable.html @@ -1,7 +1,7 @@ - +
    @@ -11,14 +11,21 @@
    • - 表名称： + 表名称： +
    • - 表描述： -
      • + 表描述： +
    •  搜索 -  重置 +  重置
    @@ -31,6 +38,7 @@
    + \ No newline at end of file