gitee
/
guns
mirror of https://gitee.com/stylefeng/guns
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

pull/65/head
chenjinlong 2021-01-26 23:52:57 +08:00
parent 011aa29d7f 92de04c7ea
commit 85a8a9d053
9 changed files with 27 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/cn/stylefeng/guns/core/beetl/CustomBeetlGroupUtilConfiguration.java
View File

@ -28,7 +28,7 @@ public class CustomBeetlGroupUtilConfiguration extends BeetlGroupUtilConfigurati
// 获取当前用户的接口
groupTemplate.registerFunctionPackage("loginUser", loginUserApi);
// 字符串处理工具类
// 对象工具类
groupTemplate.registerFunctionPackage("objectUtil", ObjectUtil.class);
// 获取基本信息的工具

12
src/main/java/cn/stylefeng/guns/modular/system/dict/DictViewController.java
View File

@ -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";
}
/**
* 字典管理-添加系统配置字典-视图
*

11
src/main/java/cn/stylefeng/guns/modular/system/i18n/TranslationViewController.java
View File

@ -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";
}
}

0
src/main/webapp/assets/modular/system/dict/dict_add_translation.js → src/main/webapp/assets/modular/system/i18n/dict_add_translation.js
View File

16
src/main/webapp/assets/modular/system/i18n/translation.js
View File

@ -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,

31
src/main/webapp/pages/modular/system/dict/dict_add_translation.html → src/main/webapp/pages/modular/system/i18n/dict_add_translation.html
View File

@ -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"]}){
<form class="layui-form" id="dictForm" lay-filter="dictForm">
<div class="layui-fluid" style="padding-bottom: 75px;">
@ -7,34 +7,17 @@
<div class="layui-form-item layui-row">
<input id="dictTypeId" name="dictTypeId" type="hidden"/>
<input id="dictTypeCode" name="dictTypeCode" type="hidden"/>
<input id="dictTypeName" name="dictTypeName" type="hidden"/>
<div class="layui-inline layui-col-md12">
<label class="layui-form-label layui-form-required">字典类型</label>
<label class="layui-form-label layui-form-required">语种名称</label>
<div class="layui-input-block">
<input id="dictTypeName" name="dictTypeName" placeholder="" type="text" class="layui-input" lay-verify="required" readonly/>
<input id="dictName" name="dictName" placeholder="请输入语种名称（例如：中文）" type="text" class="layui-input" lay-verify="required" required/>
</div>
</div>
<div class="layui-inline layui-col-md6">
<label class="layui-form-label layui-form-required">字典名称</label>
<div class="layui-inline layui-col-md12">
<label class="layui-form-label layui-form-required">语种编码</label>
<div class="layui-input-block">
<input id="dictName" name="dictName" placeholder="请输入字典名称" type="text" class="layui-input" lay-verify="required" required/>
</div>
</div>
<div class="layui-inline layui-col-md6">
<label class="layui-form-label">字典简称</label>
<div class="layui-input-block">
<input id="dictShortName" name="dictShortName" placeholder="请输入简称" type="text" class="layui-input"/>
</div>
</div>
<div class="layui-inline layui-col-md6">
<label class="layui-form-label layui-form-required">字典编码</label>
<div class="layui-input-block">
<input id="dictCode" name="dictCode" placeholder="请输入字典编码" type="text" class="layui-input" lay-verify="required" required/>
</div>
</div>
<div class="layui-inline layui-col-md6">
<label class="layui-form-label">编码简写</label>
<div class="layui-input-block">
<input id="dictShortCode" name="dictShortCode" placeholder="请输入编码简写" type="text" class="layui-input"/>
<input id="dictCode" name="dictCode" placeholder="请输入语种编码（例如：chinese）" type="text" class="layui-input" lay-verify="required" required/>
</div>
</div>
<div class="layui-inline layui-col-md12">

9
src/main/webapp/pages/modular/system/i18n/translation.html
View File

@ -32,12 +32,8 @@
<form class="layui-form toolbar">
<div class="layui-form-item">
<div class="layui-inline" style="max-width: 140px;">
<input name="dictName" class="layui-input" type="text" placeholder="类型" autocomplete="off"/>
<input name="dictName" class="layui-input" type="text" placeholder="语种名称" autocomplete="off"/>
</div>
<!--
<div class="layui-inline" style="max-width: 140px;">
<input name="dictTypeCode" class="layui-input" type="text" placeholder="编码" autocomplete="off"/>
</div>-->
<div class="layui-inline">
<button class="layui-btn icon-btn" lay-filter="dictSearchBtn" lay-submit>
<i class="layui-icon">&#xe615;</i>搜索
@ -83,7 +79,6 @@
<!-- 表格头部操作列 -->
<script type="text/html" id="dictHtbBar">
<button lay-event="add" class="layui-btn layui-btn-sm icon-btn"><i class="layui-icon">&#xe654;</i>添加</button>
<!--<button lay-event="edit" class="layui-btn layui-btn-sm layui-btn-warm icon-btn"><i class="layui-icon">&#xe642;</i>修改</button>-->
<button lay-event="del" class="layui-btn layui-btn-sm layui-btn-danger icon-btn"><i class="layui-icon">&#xe640;</i>删除</button>
</script>
@ -94,6 +89,4 @@
</script>
<!-- 表格操作列结束 -->
@}