diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-blue-light2.css b/common/src/main/resources/static/adminlte/css/skins/skin-blue-light2.css
index 0f7eb2d8..c2ef1859 100644
--- a/common/src/main/resources/static/adminlte/css/skins/skin-blue-light2.css
+++ b/common/src/main/resources/static/adminlte/css/skins/skin-blue-light2.css
@@ -201,9 +201,11 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
 .select2-container--default.select2-container--focus .select2-selection--single,
 .select2-container--default.select2-container--focus .select2-selection--multiple {border-color:#40a9ff!important;box-shadow:0 0 0 2px rgba(24,144,255,.2);}
 .table thead tr, .ui-jqgrid-htable thead tr, .ui-jqgrid-hdiv, .ui-jqgrid-hbox {background-color:#f6f6f6;}
+.ui-jqgrid .ui-jqgrid-labels th, .ui-jqgrid tr.ui-row-ltr td, .ui-jqgrid tr.ui-row-rtl td, .ui-jqgrid tr.ui-row-ltr td:last-child,
 .ui-jqgrid .ui-jqgrid-htable th.ui-th-column-header, .ui-jqgrid .ui-jqgrid-htable th.ui-th-column,
-.ui-jqgrid .ui-jqgrid-labels th, .ui-jqgrid .ui-widget-content, .ui-jqgrid tr.ui-row-ltr td,
-.ui-jqgrid tr.ui-row-rtl td, .ui-jqgrid tr.ui-row-ltr td:last-child {border-color:#eaeaea;}
+.ui-jqgrid .frozen-right th.ui-th-ltr, .ui-jqgrid .frozen-right tr.ui-row-ltr td,
+.ui-jqgrid .frozen-left th.ui-th-ltr, .ui-jqgrid .frozen-left tr.ui-row-ltr td,
+.ui-jqgrid.ui-widget-content, .ui-jqgrid .ui-widget-content {border-color:#eaeaea;}
 .ui-state-hover td, .ui-widget-content .ui-state-hover td, .ui-widget-header .ui-state-hover td,
 .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus {background:#f5f5f5;}
 .ui-jqgrid tr.ui-state-highlight.ui-row-ltr td {background-color:#ecf9ff;}
diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-blue-light3.css b/common/src/main/resources/static/adminlte/css/skins/skin-blue-light3.css
index 22fb9c1d..abe9346c 100644
--- a/common/src/main/resources/static/adminlte/css/skins/skin-blue-light3.css
+++ b/common/src/main/resources/static/adminlte/css/skins/skin-blue-light3.css
@@ -179,7 +179,7 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
 .tabpanel_mover li .title {padding-left:0;text-align:center;}
 .tabpanel_mover li.active {background-color:#3aa0ff;}
 .tabpanel_mover li.active div {color:#fff;}
-.tabpanel_mover li .closer {font:11px/1 FontAwesome;top:6px;right:4px;background:none;opacity:0.7;}
+.tabpanel_mover li .closer {font:11px/1 FontAwesome;top:7px;right:4px;background:none;opacity:0.7;}
 .tabpanel_mover li .closer:before {content:"\f00d";}
 .tabpanel_mover li .closer:hover {background:none;-moz-transform:scale(1.2);-webkit-transform:scale(1.2); 
      -o-transform:scale(1.2);-ms-transform:scale(1.2);transform:scale(1.2);color:#d30606;}
@@ -225,7 +225,9 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
 .table thead tr, .ui-jqgrid-htable thead tr, .ui-jqgrid-hdiv, .ui-jqgrid-hbox {background-color:#fafafa;}
 .ui-jqgrid .ui-jqgrid-labels th, .ui-jqgrid tr.ui-row-ltr td, .ui-jqgrid tr.ui-row-rtl td, .ui-jqgrid tr.ui-row-ltr td:last-child,
 .ui-jqgrid .ui-jqgrid-htable th.ui-th-column-header, .ui-jqgrid .ui-jqgrid-htable th.ui-th-column,
-.ui-jqgrid.ui-widget-content, .ui-jqgrid .ui-widget-content {border-color:#f0f0f0;}
+.ui-jqgrid .frozen-right th.ui-th-ltr, .ui-jqgrid .frozen-right tr.ui-row-ltr td,
+.ui-jqgrid .frozen-left th.ui-th-ltr, .ui-jqgrid .frozen-left tr.ui-row-ltr td,
+.ui-jqgrid.ui-widget-content, .ui-jqgrid .ui-widget-content {border-color:#eeeeee;}
 .ui-state-hover td, .ui-widget-content .ui-state-hover td, .ui-widget-header .ui-state-hover td,
 .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus {background:#f5f5f5;}
 .ui-jqgrid tr.ui-state-highlight.ui-row-ltr td {background-color:#ecf9ff;}
diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-blue2.css b/common/src/main/resources/static/adminlte/css/skins/skin-blue2.css
index 5ac1771a..83e63484 100644
--- a/common/src/main/resources/static/adminlte/css/skins/skin-blue2.css
+++ b/common/src/main/resources/static/adminlte/css/skins/skin-blue2.css
@@ -201,9 +201,11 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
 .select2-container--default.select2-container--focus .select2-selection--single,
 .select2-container--default.select2-container--focus .select2-selection--multiple {border-color:#557bfa!important;box-shadow:0 0 0 2px rgba(24,80,236,.2);}
 .table thead tr, .ui-jqgrid-htable thead tr, .ui-jqgrid-hdiv, .ui-jqgrid-hbox {background-color:#f6f6f6;}
+.ui-jqgrid .ui-jqgrid-labels th, .ui-jqgrid tr.ui-row-ltr td, .ui-jqgrid tr.ui-row-rtl td, .ui-jqgrid tr.ui-row-ltr td:last-child,
 .ui-jqgrid .ui-jqgrid-htable th.ui-th-column-header, .ui-jqgrid .ui-jqgrid-htable th.ui-th-column,
-.ui-jqgrid .ui-jqgrid-labels th, .ui-jqgrid .ui-widget-content, .ui-jqgrid tr.ui-row-ltr td,
-.ui-jqgrid tr.ui-row-rtl td, .ui-jqgrid tr.ui-row-ltr td:last-child {border-color:#eaeaea;}
+.ui-jqgrid .frozen-right th.ui-th-ltr, .ui-jqgrid .frozen-right tr.ui-row-ltr td,
+.ui-jqgrid .frozen-left th.ui-th-ltr, .ui-jqgrid .frozen-left tr.ui-row-ltr td,
+.ui-jqgrid.ui-widget-content, .ui-jqgrid .ui-widget-content {border-color:#eaeaea;}
 .ui-state-hover td, .ui-widget-content .ui-state-hover td, .ui-widget-header .ui-state-hover td,
 .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus {background:#f5f5f5;}
 .ui-jqgrid tr.ui-state-highlight.ui-row-ltr td {background-color:#f0f5ff;}
diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-blue3.css b/common/src/main/resources/static/adminlte/css/skins/skin-blue3.css
index b73ecb7b..3615cb56 100644
--- a/common/src/main/resources/static/adminlte/css/skins/skin-blue3.css
+++ b/common/src/main/resources/static/adminlte/css/skins/skin-blue3.css
@@ -179,7 +179,7 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
 .tabpanel_mover li .title {padding-left:0;text-align:center;}
 .tabpanel_mover li.active {background-color:#316ee6;}
 .tabpanel_mover li.active div {color:#fff;}
-.tabpanel_mover li .closer {font:11px/1 FontAwesome;top:6px;right:4px;background:none;opacity:0.7;}
+.tabpanel_mover li .closer {font:11px/1 FontAwesome;top:7px;right:4px;background:none;opacity:0.7;}
 .tabpanel_mover li .closer:before {content:"\f00d";}
 .tabpanel_mover li .closer:hover {background:none;-moz-transform:scale(1.2);-webkit-transform:scale(1.2); 
      -o-transform:scale(1.2);-ms-transform:scale(1.2);transform:scale(1.2);color:#d30606;}
@@ -225,7 +225,9 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
 .table thead tr, .ui-jqgrid-htable thead tr, .ui-jqgrid-hdiv, .ui-jqgrid-hbox {background-color:#fafafa;}
 .ui-jqgrid .ui-jqgrid-labels th, .ui-jqgrid tr.ui-row-ltr td, .ui-jqgrid tr.ui-row-rtl td, .ui-jqgrid tr.ui-row-ltr td:last-child,
 .ui-jqgrid .ui-jqgrid-htable th.ui-th-column-header, .ui-jqgrid .ui-jqgrid-htable th.ui-th-column,
-.ui-jqgrid.ui-widget-content, .ui-jqgrid .ui-widget-content {border-color:#f0f0f0;}
+.ui-jqgrid .frozen-right th.ui-th-ltr, .ui-jqgrid .frozen-right tr.ui-row-ltr td,
+.ui-jqgrid .frozen-left th.ui-th-ltr, .ui-jqgrid .frozen-left tr.ui-row-ltr td,
+.ui-jqgrid.ui-widget-content, .ui-jqgrid .ui-widget-content {border-color:#eeeeee;}
 .ui-state-hover td, .ui-widget-content .ui-state-hover td, .ui-widget-header .ui-state-hover td,
 .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus {background:#f5f5f5;}
 .ui-jqgrid tr.ui-state-highlight.ui-row-ltr td {background-color:#f0f5ff;}
diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-dark.css b/common/src/main/resources/static/adminlte/css/skins/skin-dark.css
index 54bc2918..9b6e64d8 100644
--- a/common/src/main/resources/static/adminlte/css/skins/skin-dark.css
+++ b/common/src/main/resources/static/adminlte/css/skins/skin-dark.css
@@ -177,7 +177,7 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
 .tabpanel_mover li .title {padding-left:0;text-align:center;color:#ddd;}
 .tabpanel_mover li.active {background-color:#2975bc;}
 .tabpanel_mover li.active div {color:#fff;}
-.tabpanel_mover li .closer {font:11px/1 FontAwesome;top:6px;right:4px;background:none;opacity:0.7;}
+.tabpanel_mover li .closer {font:11px/1 FontAwesome;top:7px;right:4px;background:none;opacity:0.7;}
 .tabpanel_mover li .closer:before {content:"\f00d";}
 .tabpanel_mover li .closer:hover {background:none;-moz-transform:scale(1.2);-webkit-transform:scale(1.2);
      -o-transform:scale(1.2);-ms-transform:scale(1.2);transform:scale(1.2);color:#d30606;}
@@ -286,6 +286,8 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
 .table-hover>tbody>tr:hover>td, .table-hover>tbody>tr:hover>th {background-color:#323232;}
 .ui-jqgrid .ui-jqgrid-labels th, .ui-jqgrid tr.ui-row-ltr td, .ui-jqgrid tr.ui-row-rtl td, .ui-jqgrid tr.ui-row-ltr td:last-child,
 .ui-jqgrid .ui-jqgrid-htable th.ui-th-column-header, .ui-jqgrid .ui-jqgrid-htable th.ui-th-column,
+.ui-jqgrid .frozen-right th.ui-th-ltr, .ui-jqgrid .frozen-right tr.ui-row-ltr td,
+.ui-jqgrid .frozen-left th.ui-th-ltr, .ui-jqgrid .frozen-left tr.ui-row-ltr td,
 .ui-jqgrid.ui-widget-content, .ui-jqgrid .ui-widget-content {border-color:#333;}
 .ui-state-hover td, .ui-widget-content .ui-state-hover td, .ui-widget-header .ui-state-hover td,
 .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus {background:#222;}
@@ -295,8 +297,6 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
 .ui-jqgrid .ui-jqgrid-htable th div {padding:15px 0 15px 2px;}
 .ui-jqgrid tr.jqgrow td {height: 49px;}
 
-.ui-jqgrid .frozen-left th.ui-th-ltr, .ui-jqgrid .frozen-left tr.ui-row-ltr td {border-right-color:#333}
-.ui-jqgrid .frozen-right th.ui-th-ltr, .ui-jqgrid .frozen-right tr.ui-row-ltr td {border-left-color:#333}
 .ui-jqgrid tr.jqgroup td, .ui-jqgrid tr.footrow td, .ui-jqgrid tr.jqfoot td {background:#323232;}
 .ui-jqgrid .actions .moreItems {background:#1a1a1a;border-color:#3c3c3c;box-shadow:none;}
 .ui-jqgrid .actions .moreItems a {color:#ddd;}
diff --git a/modules/core/src/main/resources/templates/modules/gen/include/formChildTable.html b/modules/core/src/main/resources/templates/modules/gen/include/formChildTable.html
index 81514205..b15f3e26 100644
--- a/modules/core/src/main/resources/templates/modules/gen/include/formChildTable.html
+++ b/modules/core/src/main/resources/templates/modules/gen/include/formChildTable.html
@@ -3,7 +3,7 @@
 	for (child in table.childList){
 %>
 				<div class="form-unit">\${text('${child.comments}')}</div>
-				<div class="ml10 mr10 table-form">
+				<div class="form-unit-wrap table-form">
 					<table id="${@StringUtils.uncap(child.className)}DataGrid"></table>
 				<% if(table.tplCategory != 'query'){ %>
 					\<% if (hasPermi('${permissionPrefix}:edit')){ %>
diff --git a/modules/core/src/main/resources/views/modules/sys/roleForm.html b/modules/core/src/main/resources/views/modules/sys/roleForm.html
index cc77d018..5c9d2807 100644
--- a/modules/core/src/main/resources/views/modules/sys/roleForm.html
+++ b/modules/core/src/main/resources/views/modules/sys/roleForm.html
@@ -145,9 +145,9 @@
 				<% } %>
 				<% if(op == 'add' || op == 'auth') {%>
 				<div class="form-unit">${text('授权功能菜单')}</div>
-				<div id="menuTrees"></div>
+				<div id="menuTrees" class="pl20"></div>
 				<script id="menuTpl" type="text/template">
-					<div id="menuDiv_{{d.key}}" class="pull-left" style="padding:0 15px;min-width:300px;">
+					<div id="menuDiv_{{d.key}}" class="pull-left" style="padding:0 10px;min-width:300px;">
 						<div class="box box-solid box-trees">
 							<div class="box-header">
 								<div class="box-title icheck">
diff --git a/modules/core/src/main/resources/views/modules/sys/roleFormAuthDataScope.html b/modules/core/src/main/resources/views/modules/sys/roleFormAuthDataScope.html
index 70fa6761..20a43169 100644
--- a/modules/core/src/main/resources/views/modules/sys/roleFormAuthDataScope.html
+++ b/modules/core/src/main/resources/views/modules/sys/roleFormAuthDataScope.html
@@ -59,9 +59,9 @@
 					</div>
 				</div>
 				<div class="form-unit">${text('授权数据权限')}</div>
-				<div id="dataScopeTrees"></div>
+				<div id="dataScopeTrees" class="pl20"></div>
 				<script id="dataScopeTpl" type="text/template">
-					<div id="dataScope_{{d.key}}" class="pull-left" style="padding:0 15px;min-width:300px;">
+					<div id="dataScope_{{d.key}}" class="pull-left" style="padding:0 10px;min-width:300px;">
 						<div class="box box-solid box-trees">
 							<div class="box-header">
 								<div class="box-title icheck">
diff --git a/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html b/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html
index 04da90f5..65f2f14f 100644
--- a/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html
+++ b/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html
@@ -121,7 +121,7 @@
 					</div>
 				</div>
 				<div class="form-unit">${text('分配角色')}</div>
-				<div class="pl10 pb20">
+				<div class="form-unit-wrap table-form">
 					<table id="roleGrid"></table>
 					<#form:hidden name="userRoleString"/>
 				</div>
@@ -185,9 +185,6 @@ var roleGrid = $("#roleGrid").dataGrid({
 	autoGridHeight: function(){
 		return 'auto';
 	},
-	autoGridWidth: function(){
-		return $('#inputForm .box-body').width()-20;
-	},
 	onSelectRow: function(id, isSelect, event){
 		if (!isSelect && id == '${corpAdminRoleCode}') {
 			js.showMessage('${text("该角色为管理员默认，不能取消。")}');
diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserForm.html b/modules/core/src/main/resources/views/modules/sys/user/empUserForm.html
index 47e7aba7..ef62fdca 100644
--- a/modules/core/src/main/resources/views/modules/sys/user/empUserForm.html
+++ b/modules/core/src/main/resources/views/modules/sys/user/empUserForm.html
@@ -201,7 +201,7 @@
 				<% } %>
 				<% if(hasPermi('sys:empUser:authRole') && (op == 'add' || op == 'auth')) { %>
 				<div class="form-unit">${text('分配角色')}</div>
-				<div class="pl10 pb20">
+				<div class="form-unit-wrap table-form">
 					<table id="roleGrid"></table>
 					<#form:hidden name="userRoleString"/>
 				</div>
@@ -293,9 +293,6 @@ var roleGrid = $("#roleGrid").dataGrid({
 	autoGridHeight: function(){
 		return 'auto';
 	},
-	autoGridWidth: function(){
-		return $('#inputForm .box-body').width()-20;
-	},
 	ajaxSuccess: function(){
 		//# for (role in roleList!){
  		roleGrid.dataGrid('setSelectRow', '${role.roleCode}');
diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserFormAuthDataScope.html b/modules/core/src/main/resources/views/modules/sys/user/empUserFormAuthDataScope.html
index 51f0c754..a33b3c21 100644
--- a/modules/core/src/main/resources/views/modules/sys/user/empUserFormAuthDataScope.html
+++ b/modules/core/src/main/resources/views/modules/sys/user/empUserFormAuthDataScope.html
@@ -33,9 +33,9 @@
 					</div>
 				</div>
 				<div class="form-unit">${text('数据权限')}</div>
-				<div id="dataScopeTrees"></div>
+				<div id="dataScopeTrees" class="pl20"></div>
 				<script id="dataScopeTpl" type="text/template">
-					<div id="dataScope_{{d.key}}" class="pull-left" style="padding:0 15px;min-width:300px;">
+					<div id="dataScope_{{d.key}}" class="pull-left" style="padding:0 10px;min-width:300px;">
 						<div class="box box-solid box-trees">
 							<div class="box-header">
 								<div class="box-title icheck">
diff --git a/modules/core/src/main/resources/views/modules/sys/user/secAdminForm.html b/modules/core/src/main/resources/views/modules/sys/user/secAdminForm.html
index 66a9bd82..ca7ba4eb 100644
--- a/modules/core/src/main/resources/views/modules/sys/user/secAdminForm.html
+++ b/modules/core/src/main/resources/views/modules/sys/user/secAdminForm.html
@@ -11,7 +11,8 @@
 		</div>
 		<#form:form id="inputForm" model="${user}" action="${ctx}/sys/secAdmin/save" method="post" class="form-horizontal">
 			<#form:hidden path="userCode"/>
-			<div class="box-body"><br/>
+			<div class="box-body">
+				<div class="form-unit">${text('基本信息')}</div>
 				<div class="row">
 					<div class="col-xs-6">
 						<div class="form-group">
@@ -33,9 +34,9 @@
 					</div>
 				</div>
 				<div class="form-unit">${text('可管理的数据权限')}</div>
-				<div id="dataScopeTrees"></div>
+				<div id="dataScopeTrees" class="pl20"></div>
 				<script id="dataScopeTpl" type="text/template">
-					<div class="pull-left" style="padding:0 15px;min-width:300px;">
+					<div class="pull-left" style="padding:0 10px;min-width:300px;">
 						<div class="box box-solid box-trees">
 							<div class="box-header">
 								<div class="box-title icheck">
diff --git a/modules/static/src/main/resources/static/jqGrid/4.7/css/ui.jqgrid.css b/modules/static/src/main/resources/static/jqGrid/4.7/css/ui.jqgrid.css
index 87869364..632173ef 100644
--- a/modules/static/src/main/resources/static/jqGrid/4.7/css/ui.jqgrid.css
+++ b/modules/static/src/main/resources/static/jqGrid/4.7/css/ui.jqgrid.css
@@ -272,7 +272,7 @@ a.g-menu-item, a.soptclass, a.clearsearchclass { cursor: pointer; }
 /* header */
 .ui-jqgrid .ui-jqgrid-hdiv {line-height:15px;}
 .ui-jqgrid .ui-jqgrid-htable th {height:39px;}
-.ui-jqgrid .ui-jqgrid-htable th div {padding:9px 0px 8px 2px;line-height:17px;}
+.ui-jqgrid .ui-jqgrid-htable th div {padding:9px 0 8px 2px;line-height:17px;}
 .ui-jqgrid .ui-jqgrid-labels th {border-right:1px solid #ddd;font-weight:normal;text-align:center;}
 .ui-jqgrid .ui-jqgrid-htable th.ui-th-column {border-bottom:1px solid #ddd;position:relative;overflow:visible;}
 .ui-jqgrid .ui-jqgrid-htable th.ui-th-column-header {border-bottom:1px solid #ddd;padding:5px 4px;}
@@ -292,7 +292,7 @@ a.g-menu-item, a.soptclass, a.clearsearchclass { cursor: pointer; }
 /* body */ 
 .ui-jqgrid .ui-widget-content {border:1px solid #ddd;}
 .ui-jqgrid tr.jqgrow, .ui-jqgrid tr.ui-row-ltr, .ui-jqgrid tr.ui-row-rtl {border:none;}
-.ui-jqgrid tr.ui-row-ltr td, .ui-jqgrid tr.ui-row-rtl td {border-bottom:1px solid #ddd;border-color:#E1E1E1;}
+.ui-jqgrid tr.ui-row-ltr td, .ui-jqgrid tr.ui-row-rtl td {border-color:#e1e1e1;border-bottom:1px solid #e1e1e1;}
 .ui-jqgrid tr.jqgrow td {height:39px;padding:3px 6px;white-space:nowrap;text-overflow:ellipsis;} /* 溢出省略 */
 .ui-jqgrid tr.jqgrow td.clip {text-overflow:clip;} /* 不显示省略号，截断显示 */
 .ui-jqgrid tr.jqgrow td.actions {overflow-x:auto;text-overflow:clip;} /* 操作列样式 */
@@ -322,8 +322,8 @@ a.g-menu-item, a.soptclass, a.clearsearchclass { cursor: pointer; }
 .ui-jqgrid .frozen-left tr.ui-row-ltr td {border-right:1px solid #eaeaea;}
 .ui-jqgrid .frozen-right th.ui-th-ltr,
 .ui-jqgrid .frozen-right tr.ui-row-ltr td {border-right:0;border-left:1px solid #eaeaea;}
-.ui-jqgrid .frozen-bdiv.frozen-left {box-shadow:6px 0px 8px -5px rgba(0,0,0,.12);}
-.ui-jqgrid .frozen-bdiv.frozen-right {box-shadow:-6px 0px 8px -5px rgba(0,0,0,.12);}
+.ui-jqgrid .frozen-bdiv.frozen-left {box-shadow:6px 0 8px -5px rgba(0,0,0,.12);}
+.ui-jqgrid .frozen-bdiv.frozen-right {box-shadow:-6px 0 8px -5px rgba(0,0,0,.12);}
 
 /* subgrid */
 .ui-jqgrid .tablediv{padding:3px;}
@@ -334,7 +334,7 @@ a.g-menu-item, a.soptclass, a.clearsearchclass { cursor: pointer; }
 .ui-jqgrid .editable .input-group {z-index:1;/* 显示到锁定列下面 */}
 .ui-jqgrid .editable .wup_container .placeholder p {display:none;}
 .ui-jqgrid .editable .wup_container .queueList .table {margin-bottom:2px;}
-.ui-jqgrid .editable .wup_container .placeholder .webuploader-pick {margin:0px auto 0 auto;}
+.ui-jqgrid .editable .wup_container .placeholder .webuploader-pick {margin:0 auto 0 auto;}
 .ui-jqgrid .editable .wup_container .wup_img .placeholder {padding:0;}
 .ui-jqgrid .editable .wup_container .wup_img .placeholder .webuploader-pick {margin: 3px 0 0 0;}
 .ui-jqgrid .editable .wup_container .wup_input {top:10px;left:2%;}
@@ -379,14 +379,14 @@ a.g-menu-item, a.soptclass, a.clearsearchclass { cursor: pointer; }
 .check_all{position:absolute;left:20px;bottom:7px;}
 
 /* 标题自动换行 */
-/* th.ui-th-column div{white-space:normal!important;height:auto!important;padding:0px;}
+/* th.ui-th-column div{white-space:normal!important;height:auto!important;padding:0;}
 .ui-jqgrid .ui-jqgrid-htable th div{padding-top:2px;} */
 th.ui-th-column div{white-space:normal!important;height:auto!important;}
 /* .ui-jqgrid .ui-jqgrid-htable th div{height:auto!important;} */
 
 /* 调整标题高度
 .ui-jqgrid .ui-jqgrid-htable th {height:24px;}
-.ui-jqgrid .ui-jqgrid-htable th div {padding:4px 0px 3px 2px;}
+.ui-jqgrid .ui-jqgrid-htable th div {padding:4px 0 3px 2px;}
 .ui-jqgrid .ui-jqgrid-frozen .ui-jqgrid-htable th div {height:24px!important;} */
 
 /* print style */
diff --git a/modules/static/src/main/resources/static/wdScrollTab/css/TabPanel.css b/modules/static/src/main/resources/static/wdScrollTab/css/TabPanel.css
index 75524ed5..4c57e319 100644
--- a/modules/static/src/main/resources/static/wdScrollTab/css/TabPanel.css
+++ b/modules/static/src/main/resources/static/wdScrollTab/css/TabPanel.css
@@ -7,8 +7,8 @@
 
 .tabpanel_tab_content {
 	width: 100%;
-	height: 39px;
-	line-height: 39px;
+	height: 38px;
+	line-height: 21px;
 	background-color: #F9F9F9;
 	border-bottom: 1px solid #e5e5e5;
 	overflow: hidden;
@@ -36,7 +36,7 @@
 
 .tabpanel_mover li {
 	width: 105px;
-	line-height: 20px;
+	/*line-height: 20px;*/
 	padding: 9px 16px 9px 5px;
 	background-color: #f4f6f8;
 	float: left;
@@ -79,7 +79,7 @@
 .tabpanel_mover li .title i{
 	font-size: 18px;
 	vertical-align: middle;
-	margin-top: -2px;
+	margin-top: -3px;
 	opacity: 0.8
 }
 
diff --git a/web-fast/src/main/resources/views/modules/demo/demoFormEditForm.html b/web-fast/src/main/resources/views/modules/demo/demoFormEditForm.html
index 84c53d38..8cce16f8 100644
--- a/web-fast/src/main/resources/views/modules/demo/demoFormEditForm.html
+++ b/web-fast/src/main/resources/views/modules/demo/demoFormEditForm.html
@@ -285,7 +285,7 @@
 					</div>
 				</div>
 				<div class="form-unit">测试数据子表</div>
-				<div class="ml10 mr10 table-form">
+				<div class="form-unit-wrap table-form">
 					<table id="testDataChildDataGrid"></table>
 					<% if (hasPermi('test:testData:edit')){ %>
 						<a href="#" id="testDataChildDataGridAddRowBtn" class="btn btn-primary btn-sm mt10 mb10"><i class="fa fa-plus"></i> 增行</a>
diff --git a/web-fast/src/main/resources/views/modules/test/testDataForm.html b/web-fast/src/main/resources/views/modules/test/testDataForm.html
index 14e6e11c..9da06181 100644
--- a/web-fast/src/main/resources/views/modules/test/testDataForm.html
+++ b/web-fast/src/main/resources/views/modules/test/testDataForm.html
@@ -171,7 +171,7 @@
 					</div>
 				</div>
 				<div class="form-unit">${text('子表数据')}</div>
-				<div class="ml10 mr10 table-form">
+				<div class="form-unit-wrap table-form">
 					<table id="testDataChildDataGrid"></table>
 					<% if (hasPermi('test:testData:edit')){ %>
 						<a href="#" id="testDataChildDataGridAddRowBtn" class="btn btn-primary btn-sm mt10 mb10"><i class="fa fa-plus"></i> ${text('增行')}</a>
diff --git a/web/src/main/resources/views/modules/demo/demoFormEditForm.html b/web/src/main/resources/views/modules/demo/demoFormEditForm.html
index 84c53d38..8cce16f8 100644
--- a/web/src/main/resources/views/modules/demo/demoFormEditForm.html
+++ b/web/src/main/resources/views/modules/demo/demoFormEditForm.html
@@ -285,7 +285,7 @@
 					</div>
 				</div>
 				<div class="form-unit">测试数据子表</div>
-				<div class="ml10 mr10 table-form">
+				<div class="form-unit-wrap table-form">
 					<table id="testDataChildDataGrid"></table>
 					<% if (hasPermi('test:testData:edit')){ %>
 						<a href="#" id="testDataChildDataGridAddRowBtn" class="btn btn-primary btn-sm mt10 mb10"><i class="fa fa-plus"></i> 增行</a>
diff --git a/web/src/main/resources/views/modules/test/testDataForm.html b/web/src/main/resources/views/modules/test/testDataForm.html
index 14e6e11c..9da06181 100644
--- a/web/src/main/resources/views/modules/test/testDataForm.html
+++ b/web/src/main/resources/views/modules/test/testDataForm.html
@@ -171,7 +171,7 @@
 					</div>
 				</div>
 				<div class="form-unit">${text('子表数据')}</div>
-				<div class="ml10 mr10 table-form">
+				<div class="form-unit-wrap table-form">
 					<table id="testDataChildDataGrid"></table>
 					<% if (hasPermi('test:testData:edit')){ %>
 						<a href="#" id="testDataChildDataGridAddRowBtn" class="btn btn-primary btn-sm mt10 mb10"><i class="fa fa-plus"></i> ${text('增行')}</a>
diff --git a/web/src/main/resources/views/modules/test/testDataForm2.html b/web/src/main/resources/views/modules/test/testDataForm2.html
index bf660f50..ff223ca7 100644
--- a/web/src/main/resources/views/modules/test/testDataForm2.html
+++ b/web/src/main/resources/views/modules/test/testDataForm2.html
@@ -172,7 +172,7 @@
 					</div>
 				</div>
 				<div class="form-unit">${text('子表数据')}</div>
-				<div class="ml10 mr10 table-form">
+				<div class="form-unit-wrap table-form">
 					<table id="testDataChildDataGrid"></table>
 					<% if (hasPermi('test:testData:edit')){ %>
 						<a href="#" id="testDataChildDataGridAddRowBtn" class="btn btn-primary btn-sm mt10 mb10"><i class="fa fa-plus"></i> ${text('增行')}</a>