diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx
index 350e894d..d15a7a63 100644
Binary files a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx and b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx differ
diff --git a/parent/pom.xml b/parent/pom.xml
index bf5d08b8..c65b3993 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -51,7 +51,7 @@
 		<druid.version>1.1.21</druid.version>
 		<shiro.version>1.5.1</shiro.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>
 		
 		<!-- jdbc setting -->
diff --git a/web/src/main/resources/views/modules/test/testDataForm.html b/web/src/main/resources/views/modules/test/testDataForm.html
index 84131da6..cb4bf897 100644
--- a/web/src/main/resources/views/modules/test/testDataForm.html
+++ b/web/src/main/resources/views/modules/test/testDataForm.html
@@ -204,10 +204,10 @@ $("#testDataChildDataGrid").dataGrid({
 	columnModel: [
 		{header:'状态', name:'status', 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:'testInput', width:150, 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:'testInput', width:130, editable:true, edittype:'text', editoptions:{'maxlength':'200', 'class':'form-control'}},
+		{header:'${text("多行文本")}', name:'testTextarea', width:130, editable:true, edittype:'textarea', editoptions:{'maxlength':'200', 'class':'form-control', 'rows':'1'}},
 		{header:'${text("下拉框")}', name:'testSelect', width:100, 
 			editable:true, edittype:'select', editoptions:{'class':'form-control',
 				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',
 				items: $.merge([], ${@DictUtils.getDictListJson('sys_menu_type')}),
 				itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){
@@ -320,17 +320,17 @@ $("#testDataChildDataGrid").dataGrid({
 				}
 			}
 		},
-// 		{header:'${text("文件上传")}', name:'id', width:250,
-//			editable: true, edittype: "custom", editoptions: {
-//				custom_element: function(val, editOptions) {
-//					return js.template('fileuploadTpl', {
-//						id: 'fileupload_'+editOptions.id, title: '区域选择', 
-//						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:'id', width:200,
+			editable: true, edittype: "custom", editoptions: {
+				custom_element: function(val, editOptions) {
+					return js.template('fileuploadTpl', {
+						id: 'fileupload_'+editOptions.id, title: '区域选择', 
+						bizKey: val, bizType: 'testDataChild_file', cssClass: ''
+					});
+				}
+			}
+		},
+		{header:'${text("操作")}', name:'actions', width:60, sortable:false, fixed:true, formatter: function(val, obj, row, act){
 			var actions = [];
 			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;');