新增subgrid子表数据展示实例；图标优化；

2019-08-20 20:44:38 +08:00
parent fe2df80654
commit 57a8f10f6c
20 changed files with 104 additions and 62 deletions
--- a/web/src/main/resources/views/modules/demo/demoDataGridEditGrid.html
+++ b/web/src/main/resources/views/modules/demo/demoDataGridEditGrid.html
@@ -3,7 +3,7 @@
 	<div class="box box-main">
 		<div class="box-header">
 			<div class="box-title">
-				<i class="fa fa-list-alt"></i> 数据管理
+				<i class="fa icon-notebook"></i> 数据管理
 			</div>
 			<div class="box-tools pull-right">
 				<a href="#" class="btn btn-default" id="btnSearch" title="查询"><i class="fa fa-filter"></i> 查询</a>
--- a/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html
+++ b/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html
@@ -3,7 +3,7 @@
 	<div class="box box-main">
 		<div class="box-header">
 			<div class="box-title">
-				<i class="fa fa-list-alt"></i> 数据管理
+				<i class="fa icon-notebook"></i> 数据管理
 			</div>
 			<div class="box-tools pull-right">
 				<a href="#" class="btn btn-default" id="btnSearch" title="查询"><i class="fa fa-filter"></i> 查询</a>
--- a/web/src/main/resources/views/modules/demo/demoFormEditForm.html
+++ b/web/src/main/resources/views/modules/demo/demoFormEditForm.html
@@ -3,7 +3,7 @@
 	<div class="box box-main">
 		<div class="box-header with-border">
 			<div class="box-title">
-				<i class="fa fa-list-alt"></i> ${testData.isNewRecord ? '新增数据' : '编辑数据'}
+				<i class="fa icon-notebook"></i> ${testData.isNewRecord ? '新增数据' : '编辑数据'}
 			</div>
 			<div class="box-tools pull-right">
 				<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
--- a/web/src/main/resources/views/modules/demo/demoFormLayoutForm.html
+++ b/web/src/main/resources/views/modules/demo/demoFormLayoutForm.html
@@ -3,7 +3,7 @@
 	<div class="box box-main">
 		<div class="box-header with-border">
 			<div class="box-title">
-				<i class="fa fa-list-alt"></i> ${testData.isNewRecord ? '新增数据' : '编辑数据'}
+				<i class="fa icon-notebook"></i> ${testData.isNewRecord ? '新增数据' : '编辑数据'}
 			</div>
 			<div class="box-tools pull-right">
 				<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
--- a/web/src/main/resources/views/modules/demo/demoFormTableForm.html
+++ b/web/src/main/resources/views/modules/demo/demoFormTableForm.html
@@ -3,7 +3,7 @@
 	<div class="box box-main">
 		<div class="box-header with-border">
 			<div class="box-title">
-				<i class="fa fa-list-alt"></i> ${testData.isNewRecord ? '新增数据' : '编辑数据'}
+				<i class="fa icon-notebook"></i> ${testData.isNewRecord ? '新增数据' : '编辑数据'}
 			</div>
 			<div class="box-tools pull-right">
 				<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
--- a/web/src/main/resources/views/modules/test/testDataForm.html
+++ b/web/src/main/resources/views/modules/test/testDataForm.html
@@ -3,7 +3,7 @@
 	<div class="box box-main">
 		<div class="box-header with-border">
 			<div class="box-title">
-				<i class="fa fa-list-alt"></i> ${text(testData.isNewRecord ? '新增数据' : '编辑数据')}
+				<i class="fa icon-note"></i> ${text(testData.isNewRecord ? '新增数据' : '编辑数据')}
 			</div>
 			<div class="box-tools pull-right">
 				<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
@@ -170,7 +170,7 @@
 						</div>
 					</div>
 				</div>
-				<h4 class="form-unit">${text('测试数据子表')}</h4>
+				<h4 class="form-unit">${text('子表数据')}</h4>
 				<div class="ml10 mr10">
 					<table id="testDataChildDataGrid"></table>
 					<% if (hasPermi('test:testData:edit')){ %>
--- a/web/src/main/resources/views/modules/test/testDataList.html
+++ b/web/src/main/resources/views/modules/test/testDataList.html
@@ -3,7 +3,7 @@
 	<div class="box box-main">
 		<div class="box-header">
 			<div class="box-title">
-				<i class="fa fa-list-alt"></i> ${text('数据管理')}
+				<i class="fa icon-notebook"></i> ${text('数据管理')}
 			</div>
 			<div class="box-tools pull-right">
 				<a href="#" class="btn btn-default" id="btnSearch" title="${text('查询')}"><i class="fa fa-filter"></i> ${text('查询')}</a>
@@ -169,7 +169,46 @@ $('#dataGrid').dataGrid({
 	// 双击表格行时调用
 	ondblClickRow: function(id, rownum, colnum, event){
 		js.addTabPage(null, '编辑数据', '${ctx}/test/testData/form?id='+id);
-	},
+	},
+	
+	// 子表格支持演示
+	subGrid: true,
+	subGridRowExpanded: function (subgridId, rowId) {
+		$('#'+subgridId).html('<h5><i class="icon-docs"></i> 子表数据</h5>'
+				+'<table id="'+subgridId+'_subgrid"></table>');
+		$('#'+subgridId+'_subgrid').dataGrid({
+			url: '${ctx}/test/testData/subListData',
+			postData: {'testData.id': rowId},
+			autoGridHeight: function(){return 'auto'}, // 设置自动高度
+			autoGridWidth:  function(){return $("#"+subgridId).width();}, // 设置自动高度
+			// 设置数据表格列
+			columnModel: [
+				{header:'${text("单行文本")}', name:'testInput', width:150},
+				{header:'${text("多行文本")}', name:'testTextarea', width:150},
+				{header:'${text("下拉框")}', name:'testSelect', width:150, align:"center", formatter: function(val, obj, row, act){
+					return js.getDictLabel(${@DictUtils.getDictListJson('sys_menu_type')}, val, '${text("未知")}', true);
+				}},
+				{header:'${text("下拉多选")}', name:'testSelectMultiple', width:150, align:"center", formatter: function(val, obj, row, act){
+					return js.getDictLabel(${@DictUtils.getDictListJson('sys_menu_type')}, val, '${text("未知")}', true);
+				}},
+				{header:'${text("单选框")}', name:'testRadio', width:150, align:"center", formatter: function(val, obj, row, act){
+					return js.getDictLabel(${@DictUtils.getDictListJson('sys_menu_type')}, val, '${text("未知")}', true);
+				}},
+				{header:'${text("复选框")}', name:'testCheckbox', width:150, align:"center", formatter: function(val, obj, row, act){
+					return js.getDictLabel(${@DictUtils.getDictListJson('sys_menu_type')}, val, '${text("未知")}', true);
+				}},
+				{header:'${text("日期时间")}', name:'testDatetime', width:150, align:"center"},
+				{header:'${text("用户名称")}', name:'testUser.userName', width:150, align:"center"},
+				{header:'${text("机构名称")}', name:'testOffice.officeName', width:150, align:"center"},
+				{header:'${text("区域名称")}', name:'testAreaName', width:150, align:"center"}
+			],
+			// 加载成功后执行事件
+			ajaxSuccess: function(data){
+				
+			}
+		});
+	},
+	
 	// 加载成功后执行事件
 	ajaxSuccess: function(data){
 // 		if (data.count == 0){
--- a/web/src/main/resources/views/modules/test/testTreeForm.html
+++ b/web/src/main/resources/views/modules/test/testTreeForm.html
@@ -3,7 +3,7 @@
 	<div class="box box-main">
 		<div class="box-header with-border">
 			<div class="box-title">
-				<i class="fa fa-list-alt"></i> ${text(testTree.isNewRecord ? '新增数据' : '编辑数据')}
+				<i class="fa icon-note"></i> ${text(testTree.isNewRecord ? '新增数据' : '编辑数据')}
 			</div>
 			<div class="box-tools pull-right">
 				<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
--- a/web/src/main/resources/views/modules/test/testTreeList.html
+++ b/web/src/main/resources/views/modules/test/testTreeList.html
@@ -3,7 +3,7 @@
 	<div class="box box-main">
 		<div class="box-header">
 			<div class="box-title">
-				<i class="fa fa-list-alt"></i> ${text('数据管理')}
+				<i class="fa icon-notebook"></i> ${text('数据管理')}
 			</div>
 			<div class="box-tools pull-right">
 				<a href="#" class="btn btn-default" id="btnSearch" title="${text('查询')}"><i class="fa fa-filter"></i> ${text('查询')}</a>