diff --git a/src/main/java/cn/stylefeng/guns/core/beetl/CustomBeetlGroupUtilConfiguration.java b/src/main/java/cn/stylefeng/guns/core/beetl/CustomBeetlGroupUtilConfiguration.java index 36223009..b05abc3b 100644 --- a/src/main/java/cn/stylefeng/guns/core/beetl/CustomBeetlGroupUtilConfiguration.java +++ b/src/main/java/cn/stylefeng/guns/core/beetl/CustomBeetlGroupUtilConfiguration.java @@ -28,7 +28,7 @@ public class CustomBeetlGroupUtilConfiguration extends BeetlGroupUtilConfigurati // 获取当前用户的接口 groupTemplate.registerFunctionPackage("loginUser", loginUserApi); - // 字符串处理工具类 + // 对象工具类 groupTemplate.registerFunctionPackage("objectUtil", ObjectUtil.class); // 获取基本信息的工具 diff --git a/src/main/java/cn/stylefeng/guns/modular/system/dict/DictViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/dict/DictViewController.java index bb03ba01..eaa9dc31 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/dict/DictViewController.java +++ b/src/main/java/cn/stylefeng/guns/modular/system/dict/DictViewController.java @@ -36,18 +36,6 @@ public class DictViewController { return "/modular/system/dict/dict_add.html"; } - - /** - * 字典管理-添加翻译字典-视图 - * - * @author chenjinlong - * @date 2021/1/22 16:09 - */ - @GetResource(name = "字典管理-添加翻译字典-视图", path = "/view/dict/addTranslationView") - public String addTranslationView() { - return "/modular/system/dict/dict_add_translation.html"; - } - /** * 字典管理-添加系统配置字典-视图 * diff --git a/src/main/java/cn/stylefeng/guns/modular/system/i18n/TranslationViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/i18n/TranslationViewController.java index 5610dcd2..9c86cd67 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/i18n/TranslationViewController.java +++ b/src/main/java/cn/stylefeng/guns/modular/system/i18n/TranslationViewController.java @@ -47,4 +47,15 @@ public class TranslationViewController { return "/modular/system/i18n/translation_edit.html"; } + /** + * 多语言增加语种界面 + * + * @author chenjinlong + * @date 2021/1/22 16:09 + */ + @GetResource(name = "多语言增加语种界面", path = "/view/i18n/addTranslationView") + public String addTranslationView() { + return "/modular/system/i18n/dict_add_translation.html"; + } + } diff --git a/src/main/webapp/assets/modular/system/dict/dict_add_translation.js b/src/main/webapp/assets/modular/system/i18n/dict_add_translation.js similarity index 100% rename from src/main/webapp/assets/modular/system/dict/dict_add_translation.js rename to src/main/webapp/assets/modular/system/i18n/dict_add_translation.js diff --git a/src/main/webapp/assets/modular/system/i18n/translation.js b/src/main/webapp/assets/modular/system/i18n/translation.js index 88343624..c7b0d9aa 100644 --- a/src/main/webapp/assets/modular/system/i18n/translation.js +++ b/src/main/webapp/assets/modular/system/i18n/translation.js @@ -16,7 +16,6 @@ layui.use(['layer', 'form', 'table', 'util', 'admin', 'func', 'HttpRequest'], fu tableId: "dictTable" }; - /* 字典类型-渲染表格 */ var dictTable = table.render({ elem: '#' + Dict.tableId, @@ -26,7 +25,7 @@ layui.use(['layer', 'form', 'table', 'util', 'admin', 'func', 'HttpRequest'], fu defaultToolbar: [], //默认表格头部右侧工具栏 cols: [[ {type: 'numbers'}, - {field: 'dictName', title: '类型'}, + {field: 'dictName', title: '语种名称'}, {field: 'dictCode', title: '编码'} ]], done: function (res, curr, count) { @@ -70,17 +69,7 @@ layui.use(['layer', 'form', 'table', 'util', 'admin', 'func', 'HttpRequest'], fu func.open({ height: 680, title: '添加字典', - content: Feng.ctxPath + '/view/dict/addTranslationView', - tableId: Dict.tableId - }); - }; - - /* 字典-点击编辑对话框 */ - Dict.openEditDlg = function (data) { - func.open({ - height: 680, - title: '修改字典', - content: Feng.ctxPath + '/view/dict/editView?dictId=' + data.dictId, + content: Feng.ctxPath + '/view/i18n/addTranslationView', tableId: Dict.tableId }); }; @@ -100,7 +89,6 @@ layui.use(['layer', 'form', 'table', 'util', 'admin', 'func', 'HttpRequest'], fu Feng.confirm("是否删除?", operation); }; - /* 翻译-渲染表格 */ var translationTable = table.render({ elem: '#' + Translation.tableId, @@ -178,4 +166,4 @@ layui.use(['layer', 'form', 'table', 'util', 'admin', 'func', 'HttpRequest'], fu }; -}); \ No newline at end of file +}); diff --git a/src/main/webapp/pages/layout/_container.html b/src/main/webapp/pages/layout/_container.html index 7a8ce2b8..f2d42970 100644 --- a/src/main/webapp/pages/layout/_container.html +++ b/src/main/webapp/pages/layout/_container.html @@ -90,4 +90,4 @@ ${layoutContent} @} @} - \ No newline at end of file + diff --git a/src/main/webapp/pages/layout/_form.html b/src/main/webapp/pages/layout/_form.html index 0030f480..02daf14c 100644 --- a/src/main/webapp/pages/layout/_form.html +++ b/src/main/webapp/pages/layout/_form.html @@ -109,4 +109,4 @@ ${layoutContent} - \ No newline at end of file + diff --git a/src/main/webapp/pages/modular/system/dict/dict_add_translation.html b/src/main/webapp/pages/modular/system/i18n/dict_add_translation.html similarity index 52% rename from src/main/webapp/pages/modular/system/dict/dict_add_translation.html rename to src/main/webapp/pages/modular/system/i18n/dict_add_translation.html index bf7d245a..34fb18f3 100644 --- a/src/main/webapp/pages/modular/system/dict/dict_add_translation.html +++ b/src/main/webapp/pages/modular/system/i18n/dict_add_translation.html @@ -1,4 +1,4 @@ -@layout("/layout/_form.html",{js:["/assets/modular/system/dict/dict_add_translation.js"]}){ +@layout("/layout/_form.html",{js:["/assets/modular/system/i18n/dict_add_translation.js"]}){
@@ -7,34 +7,17 @@
+
- +
- +
-
- +
+
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- +
@@ -54,4 +37,4 @@ -@} \ No newline at end of file +@} diff --git a/src/main/webapp/pages/modular/system/i18n/translation.html b/src/main/webapp/pages/modular/system/i18n/translation.html index d104b81e..98a243c9 100644 --- a/src/main/webapp/pages/modular/system/i18n/translation.html +++ b/src/main/webapp/pages/modular/system/i18n/translation.html @@ -32,12 +32,8 @@
- +
-