manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

beetl 3.1

Browse Source
This commit is contained in:
thinkgem
2020-05-21 21:27:19 +08:00
parent 5898f292db
commit d834002391
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx
View File

Binary file not shown.

2
parent/pom.xml
View File

@@ -51,7 +51,7 @@
<druid.version>1.1.21</druid.version> <druid.version>1.1.21</druid.version>
<shiro.version>1.5.1</shiro.version> <shiro.version>1.5.1</shiro.version>
<j2cache.version>2.8.0-release</j2cache.version> <j2cache.version>2.8.0-release</j2cache.version>
<beetl.version>3.0-SNAPSHOT</beetl.version> <beetl.version>3.1-SNAPSHOT</beetl.version>
<swagger.version>1.6.0</swagger.version> <swagger.version>1.6.0</swagger.version>
<!-- jdbc setting --> <!-- jdbc setting -->

30
web/src/main/resources/views/modules/test/testDataForm.html
View File

@@ -204,10 +204,10 @@ $("#testDataChildDataGrid").dataGrid({
columnModel: [ columnModel: [
{header:'状态', name:'status', editable:true, hidden:true}, {header:'状态', name:'status', editable:true, hidden:true},
{header:'主键', name:'id', editable:true, hidden:true}, {header:'主键', name:'id', editable:true, hidden:true},
{header:'${text("排序号")}', name:'testSort', width:150, editable:true, edittype:'text', editoptions:{'maxlength':'11', 'class':'form-control digits'}}, {header:'${text("排序号")}', name:'testSort', width:130, editable:true, edittype:'text', editoptions:{'maxlength':'11', 'class':'form-control digits'}},
{header:'${text("父表主键")}', name:'testData.id', editable:true, hidden:true}, {header:'${text("父表主键")}', name:'testData.id', editable:true, hidden:true},
{header:'${text("单行文本")}', name:'testInput', width:150, editable:true, edittype:'text', editoptions:{'maxlength':'200', 'class':'form-control'}}, {header:'${text("单行文本")}', name:'testInput', width:130, editable:true, edittype:'text', editoptions:{'maxlength':'200', 'class':'form-control'}},
{header:'${text("多行文本")}', name:'testTextarea', width:150, editable:true, edittype:'textarea', editoptions:{'maxlength':'200', 'class':'form-control', 'rows':'1'}}, {header:'${text("多行文本")}', name:'testTextarea', width:130, editable:true, edittype:'textarea', editoptions:{'maxlength':'200', 'class':'form-control', 'rows':'1'}},
{header:'${text("下拉框")}', name:'testSelect', width:100, {header:'${text("下拉框")}', name:'testSelect', width:100,
editable:true, edittype:'select', editoptions:{'class':'form-control', editable:true, edittype:'select', editoptions:{'class':'form-control',
items: $.merge([{dictLabel:'&nbsp;',dictValue:''}], ${@DictUtils.getDictListJson('sys_menu_type')}), items: $.merge([{dictLabel:'&nbsp;',dictValue:''}], ${@DictUtils.getDictListJson('sys_menu_type')}),
@@ -216,7 +216,7 @@ $("#testDataChildDataGrid").dataGrid({
} }
} }
}, },
{header:'${text("下拉多选")}', name:'testSelectMultiple', width:100, {header:'${text("下拉多选")}', name:'testSelectMultiple', width:120,
editable:true, edittype:'select', editoptions:{multiple:true, 'class':'form-control', editable:true, edittype:'select', editoptions:{multiple:true, 'class':'form-control',
items: $.merge([], ${@DictUtils.getDictListJson('sys_menu_type')}), items: $.merge([], ${@DictUtils.getDictListJson('sys_menu_type')}),
itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){ itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){
@@ -320,17 +320,17 @@ $("#testDataChildDataGrid").dataGrid({
} }
} }
}, },
// {header:'${text("文件上传")}', name:'id', width:250, {header:'${text("文件上传")}', name:'id', width:200,
// editable: true, edittype: "custom", editoptions: { editable: true, edittype: "custom", editoptions: {
// custom_element: function(val, editOptions) { custom_element: function(val, editOptions) {
// return js.template('fileuploadTpl', { return js.template('fileuploadTpl', {
// id: 'fileupload_'+editOptions.id, title: '区域选择', id: 'fileupload_'+editOptions.id, title: '区域选择',
// bizKey: val, bizType: 'testDataChild_file', cssClass: '' bizKey: val, bizType: 'testDataChild_file', cssClass: ''
// }); });
// } }
// } }
// }, },
{header:'${text("操作")}', name:'actions', width:80, sortable:false, fixed:true, formatter: function(val, obj, row, act){ {header:'${text("操作")}', name:'actions', width:60, sortable:false, fixed:true, formatter: function(val, obj, row, act){
var actions = []; var actions = [];
if (val == 'new'){ if (val == 'new'){
actions.push('<a href="#" onclick="js.confirm(\'${text("你确认要删除这条数据吗？")}\', function(){$(\'#testDataChildDataGrid\').dataGrid(\'delRowData\',\''+obj.rowId+'\')});return false;"><i class="fa fa-trash-o"></i></a>&nbsp;'); actions.push('<a href="#" onclick="js.confirm(\'${text("你确认要删除这条数据吗？")}\', function(){$(\'#testDataChildDataGrid\').dataGrid(\'delRowData\',\''+obj.rowId+'\')});return false;"><i class="fa fa-trash-o"></i></a>&nbsp;');