From 7a7c1c12dc440ae75513e2a4e1e39c58e9172c5f Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Wed, 4 Mar 2020 11:41:52 +0800
Subject: [PATCH] =?UTF-8?q?jqGrid=205.4=20=E5=8D=87=E7=BA=A7=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/adminlte/css/skins/skin-blue-light2.css          | 5 +++--
 modules/core/src/main/resources/config/jeesite-core.yml     | 2 +-
 .../templates/modules/gen/include/formControl.html          | 6 ++++--
 modules/core/src/main/resources/views/include/csslibs.html  | 2 +-
 modules/core/src/main/resources/views/include/jslibs.html   | 6 +++---
 .../resources/views/modules/demo/demoDataGridGroupGrid.html | 2 +-
 web/src/main/resources/views/modules/test/testDataForm.html | 6 ++++--
 web/src/main/resources/views/modules/test/testDataList.html | 4 ++--
 8 files changed, 19 insertions(+), 14 deletions(-)

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 9496a4f5..f674160d 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
@@ -194,9 +194,10 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
 .form-control:focus,.select2-container--default.select2-container--focus .select2-selection--multiple,
 .select2-container--default .select2-search--dropdown .select2-search__field {border-color:#66afe9!important;}
 .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 {border-color: #eaeaea;}
+.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-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:#e5f3ff;}
 /* .ui-jqgrid tr.ui-row-ltr td {border-right:0!important;} */
-.ui-jqgrid tr.ui-row-ltr td:last-child {border-color:#eaeaea!important;}
diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml
index 062ed5c1..f07395c4 100644
--- a/modules/core/src/main/resources/config/jeesite-core.yml
+++ b/modules/core/src/main/resources/config/jeesite-core.yml
@@ -325,7 +325,7 @@ shiro:
 
   # 登录提交信息加密（如果不需要加密，设置为空即可）
   loginSubmit:
-    # 登录提交信息安全Key，加密用户名、密码、验证码，后再提交（key设置为3个，用逗号分隔）
+    # 登录提交信息安全Key，加密用户名、密码、验证码，后再提交（key设置为3个，用逗号分隔）默认加密方式：DES
     secretKey: thinkgem,jeesite,com
   
   # 记住我密钥设置，为空则自动生成一个新密钥，也可以通过 com.jeesite.test.RememberMeKeyGen 生成
diff --git a/modules/core/src/main/resources/templates/modules/gen/include/formControl.html b/modules/core/src/main/resources/templates/modules/gen/include/formControl.html
index ed3a1ad3..bea56714 100644
--- a/modules/core/src/main/resources/templates/modules/gen/include/formControl.html
+++ b/modules/core/src/main/resources/templates/modules/gen/include/formControl.html
@@ -173,7 +173,8 @@
 				<div class="row">
 					<div class="col-xs-12">
 						<div class="form-group">
-							<label class="control-label col-sm-2">\${text('图片上传')}：</label>
+							<label class="control-label col-sm-2">
+								<span class="required hide">*</span> \${text('图片上传')}：</label>
 							<div class="col-sm-10">
 								<${'#'}form:fileupload id="uploadImage" bizKey="\${${className}.id}" bizType="${className}_image"
 									uploadType="image" class="" readonly="false"/>
@@ -189,7 +190,8 @@
 				<div class="row">
 					<div class="col-xs-12">
 						<div class="form-group">
-							<label class="control-label col-sm-2">\${text('附件上传')}：</label>
+							<label class="control-label col-sm-2">
+								<span class="required hide">*</span> \${text('附件上传')}：</label>
 							<div class="col-sm-10">
 								<${'#'}form:fileupload id="uploadFile" bizKey="\${${className}.id}" bizType="${className}_file"
 									uploadType="all" class="" readonly="false"/>
diff --git a/modules/core/src/main/resources/views/include/csslibs.html b/modules/core/src/main/resources/views/include/csslibs.html
index 085a8fdb..f3ba091b 100644
--- a/modules/core/src/main/resources/views/include/csslibs.html
+++ b/modules/core/src/main/resources/views/include/csslibs.html
@@ -10,7 +10,7 @@
 <link rel="stylesheet" href="${ctxStatic}/wdScrollTab/css/TabPanel.css?${_version}">
 <% } %>
 <% if (@ListUtils.inString('dataGrid', libs!)){ %>
-<link rel="stylesheet" href="${ctxStatic}/jqGrid/4.7/css/ui.jqgrid.css?${_version}">
+<link rel="stylesheet" href="${ctxStatic}/jqGrid/5.4/css/ui.jqgrid.css?${_version}">
 <% } %>
 <% if (@ListUtils.inString('layout', libs!)){ %>
 <link rel="stylesheet" href="${ctxStatic}/jquery-plugins/jquery.layout-latest.css?${_version}">
diff --git a/modules/core/src/main/resources/views/include/jslibs.html b/modules/core/src/main/resources/views/include/jslibs.html
index 95ce9909..95b42726 100644
--- a/modules/core/src/main/resources/views/include/jslibs.html
+++ b/modules/core/src/main/resources/views/include/jslibs.html
@@ -13,9 +13,9 @@
 <script src="${ctxStatic}/wdScrollTab/js/TabPanel_i18n.js?${_version}"></script>
 <% } %>
 <% if (@ListUtils.inString('dataGrid', libs!)){ %>
-<script src="${ctxStatic}/jqGrid/4.7/js/jquery.jqGrid.js?${_version}"></script>
-<script src="${ctxStatic}/jqGrid/4.7/js/jquery.jqGrid.extend.js?${_version}"></script>
-<script src="${ctxStatic}/jqGrid/4.7/js/i18n/${lang()}.js?${_version}"></script>
+<script src="${ctxStatic}/jqGrid/5.4/js/jquery.jqGrid.js?${_version}"></script>
+<script src="${ctxStatic}/jqGrid/5.4/js/jquery.jqGrid.extend.js?${_version}"></script>
+<script src="${ctxStatic}/jqGrid/5.4/js/i18n/${lang()}.js?${_version}"></script>
 <% } %>
 <% if (@ListUtils.inString('validate', libs!)){ %>
 <script src="${ctxStatic}/jquery-validation/1.16/jquery.validate.js?${_version}"></script>
diff --git a/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html b/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html
index b2644837..d6c3d65f 100644
--- a/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html
+++ b/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html
@@ -127,7 +127,7 @@ $('#dataGrid').dataGrid({
 			if(obj.rowId == ''){ return '小计:'; }
 			return '<a href="${ctx}/test/testData/form?id='+row.id+'" class="btnList" data-title="编辑数据">'+(val||row.id)+'</a>';
 		}, summaryTpl: "<em>{0}</em> ", summaryType: "count"},
-		{header:'多行文本', name:'testTextarea', index:'a.test_textarea', width:150, align:"center", formatter: function(val, obj, row, act){
+		{header:'多行文本', name:'testTextarea', index:'a.test_textarea', width:150, align:"center", frozen:true, formatter: function(val, obj, row, act){
 			if(obj.rowId == ''){ return '<em>' + val + '</em>个' }
 			return val;
 		}, summaryTpl: "<em>{0}</em>", summaryType: "count"},
diff --git a/web/src/main/resources/views/modules/test/testDataForm.html b/web/src/main/resources/views/modules/test/testDataForm.html
index 2d65057a..a22ed853 100644
--- a/web/src/main/resources/views/modules/test/testDataForm.html
+++ b/web/src/main/resources/views/modules/test/testDataForm.html
@@ -151,7 +151,8 @@
 				<div class="row">
 					<div class="col-xs-12">
 						<div class="form-group">
-							<label class="control-label col-sm-2">${text('图片上传')}：</label>
+							<label class="control-label col-sm-2">
+								<span class="required hide">*</span> ${text('图片上传')}：</label>
 							<div class="col-sm-10">
 								<#form:fileupload id="uploadImage" bizKey="${testData.id}" bizType="testData_image"
 									uploadType="image" class="" readonly="false" preview="weboffice"/>
@@ -162,7 +163,8 @@
 				<div class="row">
 					<div class="col-xs-12">
 						<div class="form-group">
-							<label class="control-label col-sm-2">${text('附件上传')}：</label>
+							<label class="control-label col-sm-2">
+								<span class="required hide">*</span> ${text('附件上传')}：</label>
 							<div class="col-sm-10">
 								<#form:fileupload id="uploadFile" bizKey="${testData.id}" bizType="testData_file"
 									uploadType="all" class="" readonly="false" preview="weboffice"/>
diff --git a/web/src/main/resources/views/modules/test/testDataList.html b/web/src/main/resources/views/modules/test/testDataList.html
index 353204a7..d3d74b7c 100644
--- a/web/src/main/resources/views/modules/test/testDataList.html
+++ b/web/src/main/resources/views/modules/test/testDataList.html
@@ -179,7 +179,7 @@ $('#dataGrid').dataGrid({
 			url: '${ctx}/test/testData/subListData',
 			postData: {'testData.id': rowId},
 			autoGridHeight: function(){return 'auto'}, // 设置自动高度
-			autoGridWidth:  function(){return $("#"+subgridId).width();}, // 设置自动高度
+			autoGridWidth:  function(){return $("#"+subgridId).width()}, // 设置自动高度
 			// 设置数据表格列
 			columnModel: [
 				{header:'${text("单行文本")}', name:'testInput', width:150},
@@ -204,7 +204,7 @@ $('#dataGrid').dataGrid({
 			emptyDataHint: true, 	// 表格内没有数据的时候提示 “无数据显示” v4.1.7
 			// 加载成功后执行事件
 			ajaxSuccess: function(data){
-				
+				$(window).resize();
 			}
 		});
 	},