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

jqGrid 5.4 升级完成

Browse Source
This commit is contained in:
thinkgem
2020-03-04 11:41:52 +08:00
parent fc7849e6b0
commit 7a7c1c12dc
8 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/src/main/resources/static/adminlte/css/skins/skin-blue-light2.css
View File

@@ -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;}

2
modules/core/src/main/resources/config/jeesite-core.yml
View File

@@ -325,7 +325,7 @@ shiro:
# 登录提交信息加密（如果不需要加密，设置为空即可）
loginSubmit:
# 登录提交信息安全Key，加密用户名、密码、验证码，后再提交（key设置为3个，用逗号分隔）
# 登录提交信息安全Key，加密用户名、密码、验证码，后再提交（key设置为3个，用逗号分隔）默认加密方式：DES
secretKey: thinkgem,jeesite,com
# 记住我密钥设置，为空则自动生成一个新密钥，也可以通过 com.jeesite.test.RememberMeKeyGen 生成

6
modules/core/src/main/resources/templates/modules/gen/include/formControl.html
View File

@@ -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"/>

2
modules/core/src/main/resources/views/include/csslibs.html
View File

@@ -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}">

6
modules/core/src/main/resources/views/include/jslibs.html
View File

@@ -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>

2
web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html
View File

@@ -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"},

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

@@ -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"/>

4
web/src/main/resources/views/modules/test/testDataList.html
View File

@@ -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();
}
});
},