From 5ea915db66ee10463d73c27099d452505db7f1aa Mon Sep 17 00:00:00 2001 From: wangbing Date: Sun, 2 Feb 2020 00:46:16 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81VUE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 889e552c8332410a0a64c87ebebcbfa7576e5fe7 --- .../resources/templates/control/nav.ftl | 2 +- .../resources/templates/screen/index.ftl | 2 +- .../resources/templates/screen/module/mgr.ftl | 68 +++++++++---------- .../templates/screen/module/system/dept.ftl | 44 ++++++------ .../templates/screen/module/system/dict.ftl | 34 +++++----- .../screen/module/system/dictItem.ftl | 34 +++++----- .../templates/screen/module/system/file.ftl | 42 ++++++------ .../templates/screen/module/system/logErr.ftl | 52 +++++++------- .../templates/screen/module/system/res.ftl | 44 ++++++------ .../templates/screen/module/system/role.ftl | 34 +++++----- .../templates/screen/module/system/tokens.ftl | 26 +++---- .../templates/screen/module/system/user.ftl | 40 +++++------ 12 files changed, 209 insertions(+), 213 deletions(-) diff --git a/src/main/resources/modules/SpringBoot/resources/templates/control/nav.ftl b/src/main/resources/modules/SpringBoot/resources/templates/control/nav.ftl index 1b46adca..2c2ede9c 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/control/nav.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/control/nav.ftl @@ -742,7 +742,7 @@ props: { size: { type: String, - default: 'small' + default: 'mini' }, type: { type: String, diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/index.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/index.ftl index b0cdd977..b88cacef 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/index.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/index.ftl @@ -17,7 +17,7 @@ 系统设置 - 字典管理 + 字典管理 文件管理 资源管理 用户管理 diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl index ec87250d..bca5b0d9 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl @@ -6,51 +6,51 @@ <#if item.isQuery> <#if item.fieldType.javaType() =="Boolean"> - + <#elseif item.fieldType.javaType() =="Byte"> - + <#elseif item.fieldType.javaType() =="Short"> - + <#elseif item.fieldType.javaType() =="Integer"> - + <#elseif item.fieldType.javaType() =="Long"> - + <#elseif item.fieldType.javaType() =="Float"> - + <#elseif item.fieldType.javaType() =="Double"> - + <#elseif item.fieldType.javaType() =="Character"> - + <#elseif item.fieldType.javaType() =="String" && item.fieldType != "Dict"> - + <#elseif item.fieldType.javaType() =="String" && item.fieldType == "Dict"> - + <#elseif item.fieldType.javaType() =="Date"> <#elseif item.fieldType.javaType() =="BigDecimal"> - + - 搜索 - 重置 + 搜索 + 重置 @@ -75,27 +75,27 @@ - 新增 + 新增 - 导出 + 导出 - + - + - + - + @@ -174,51 +174,51 @@ <#if !item.isSystem> <#if item.fieldType.javaType() =="Boolean"> - + <#elseif item.fieldType.javaType() =="String" && item.fieldType != "Dict"> - + <#elseif item.fieldType.javaType() =="String" && item.fieldType == "Dict"> - + <#elseif item.fieldType.javaType() =="Byte"> - + <#elseif item.fieldType.javaType() =="Short"> - + <#elseif item.fieldType.javaType() =="Integer"> - + <#elseif item.fieldType.javaType() =="Long"> - + <#elseif item.fieldType.javaType() =="Float"> - + <#elseif item.fieldType.javaType() =="Double"> - + <#elseif item.fieldType.javaType() =="Character"> - + <#elseif item.fieldType.javaType() =="Date"> <#elseif item.fieldType.javaType() =="BigDecimal"> - + - 取 消 - 保存 + 取 消 + 保存 diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dept.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dept.ftl index 51c350b4..c424836e 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dept.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dept.ftl @@ -7,29 +7,29 @@ - + - + - + - + - + - + - 搜索 - 重置 + 搜索 + 重置 @@ -37,27 +37,27 @@ - 新增 + 新增 - 导出 + 导出 - + - + - + - + @@ -157,11 +157,11 @@ - + - + @@ -205,24 +205,24 @@ - + - + - + - + - 取 消 - 保存 + 取 消 + 保存 diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dict.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dict.ftl index 8dcdb39c..5aa0d6bc 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dict.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dict.ftl @@ -3,10 +3,10 @@ - + - + @@ -15,8 +15,8 @@ - 搜索 - 重置 + 搜索 + 重置 @@ -24,27 +24,27 @@ - 新增 + 新增 - 导出 + 导出 - + - + - + - + @@ -55,7 +55,7 @@ @selection-change="onSelectionChange" empty-text="无数据" :data="result" - size="small"> + size="mini"> - + - + - + - 取 消 - 保存 + 取 消 + 保存 diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dictItem.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dictItem.ftl index e2181d14..f56285f3 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dictItem.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dictItem.ftl @@ -3,13 +3,13 @@ - + - + - + @@ -18,8 +18,8 @@ - 搜索 - 重置 + 搜索 + 重置 @@ -27,27 +27,27 @@ - 新增 + 新增 - 导出 + 导出 - + - + - + - + @@ -58,7 +58,7 @@ @selection-change="onSelectionChange" empty-text="无数据" :data="result" - size="small"> + size="mini"> - + - + - @@ -151,8 +151,8 @@ - 取消 - 保存 + 取消 + 保存 diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/file.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/file.ftl index 36ccf6ee..ee36770a 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/file.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/file.ftl @@ -3,20 +3,20 @@ - + - + - + - + - 搜索 - 重置 + 搜索 + 重置 @@ -24,27 +24,27 @@ - 新增 + 新增 - 导出 + 导出 - + - + - + - + @@ -123,30 +123,30 @@ - + - + - + - + - + - + - + - 取 消 - 保存 + 取 消 + 保存 diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/logErr.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/logErr.ftl index 245c4bc9..d39a95f9 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/logErr.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/logErr.ftl @@ -2,26 +2,26 @@ - + - + - + - + - + - + - 搜索 - 重置 + 搜索 + 重置 @@ -29,27 +29,23 @@ - 新增 + 解决 - 导出 + 搁置 - - + + - - - - - - + + - + @@ -146,30 +142,30 @@ :visible.sync="form.dialog"> - + - + - + - + - + - + - + - 取 消 - 保存 + 取 消 + 保存 diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/res.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/res.ftl index 37b6020c..67df52a3 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/res.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/res.ftl @@ -6,26 +6,26 @@ - + - + - + - + - + - 搜索 - 重置 + 搜索 + 重置 @@ -33,27 +33,27 @@ - 新增 + 新增 - 导出 + 导出 - + - + - + - + @@ -151,11 +151,11 @@ - + - + @@ -199,32 +199,32 @@ - - - - - + - 取 消 - 保存 + 取 消 + 保存 diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/role.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/role.ftl index 2c3f8b0c..583dc11f 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/role.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/role.ftl @@ -2,17 +2,17 @@ - + - + - + - 搜索 - 重置 + 搜索 + 重置 @@ -20,27 +20,27 @@ - 新增 + 新增 - 导出 + 导出 - + - + - + - + @@ -120,19 +120,19 @@ - + - + - + - 取 消 - 保存 + 取 消 + 保存 @@ -152,7 +152,7 @@ - 关 闭 + 关 闭 diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/tokens.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/tokens.ftl index fa3eaf58..7534af6c 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/tokens.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/tokens.ftl @@ -3,14 +3,14 @@ - + - + - + - + - + - 搜索 - 重置 + 搜索 + 重置 @@ -40,25 +40,25 @@ - 导出 + 导出 - + - + - + - + diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/user.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/user.ftl index b6c1f50e..5a5fe2e4 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/user.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/user.ftl @@ -3,23 +3,23 @@ - + - + - + - + - + - 搜索 - 重置 + 搜索 + 重置 @@ -27,27 +27,27 @@ - 新增 + 新增 - 导出 + 导出 - + - + - + - + @@ -145,19 +145,19 @@ - + - + - + - + - +
@@ -167,8 +167,8 @@
- 取 消 - 保存 + 取 消 + 保存