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

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>