github/SpringBlade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fix;更新jar依赖

Browse Source
This commit is contained in:
zhuangqian 2016-09-20 22:10:10 +08:00
parent 943b43245c
commit 52514da08f
4 changed files with 523 additions and 523 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -15,8 +15,8 @@
<!-- 编译jdk版本 -->
<jdk.version>1.7</jdk.version>
<!-- 依赖版本 -->
<spring.version>4.3.2.RELEASE</spring.version>
<shiro.version>1.3.0</shiro.version>
<spring.version>4.3.3.RELEASE</spring.version>
<shiro.version>1.3.2</shiro.version>
<slf4j.version>1.7.16</slf4j.version>
<logback.version>1.1.5</logback.version>
<beetl.version>2.5.2</beetl.version>

2
src/main/java/com/smallchill/core/controller/ExcelController.java
View File

@ -90,7 +90,7 @@ public class ExcelController extends BladeController{
int cnt = 0;
for (Map<String, String> m : _colmodel) {
if (cnt > 1) {
if(Func.format(m.get("hidden")).equals("true")){
if(Func.toStr(m.get("hidden")).equals("true")){
cnt++;
continue;
}

8
src/main/java/com/smallchill/core/intercept/BladeValidator.java
View File

@ -274,7 +274,7 @@ public abstract class BladeValidator extends BladeInterceptor {
addError(errorMessage);
return;
}
if (!DateKit.isValidDate(Func.format(value))) {
if (!DateKit.isValidDate(Func.toStr(value))) {
addError(errorMessage);
}
}
@ -290,7 +290,7 @@ public abstract class BladeValidator extends BladeInterceptor {
return;
}
try {
Date temp = DateKit.parseTime(Func.format(value));
Date temp = DateKit.parseTime(Func.toStr(value));
if (temp.before(min) || temp.after(max))
addError(errorMessage);
} catch (Exception e) {
@ -306,8 +306,8 @@ public abstract class BladeValidator extends BladeInterceptor {
// validateDate(field, Date.valueOf(min), Date.valueOf(max), errorKey,
// errorMessage); 为了兼容 64位 JDK
try {
validateDate(field, DateKit.parseTime(Func.format(min)),
DateKit.parseTime(Func.format(max)), errorMessage);
validateDate(field, DateKit.parseTime(Func.toStr(min)),
DateKit.parseTime(Func.toStr(max)), errorMessage);
} catch (Exception e) {
addError(errorMessage);
}

2
src/main/webapp/static/blade/js/blade-girdmenu.js
View File

@ -52,7 +52,7 @@ $.extend({
.jqGrid('getGridParam', 'colModel');
var postdata = $(gridtbl)
.jqGrid('getGridParam', 'postData');
var source = (typeof (export_source) == "undefined") ? (code.replace(/(\w)/,function(v){return v.toUpperCase()}) + ".list") : export_source;
var source = (typeof (export_source) == "undefined") ? (code + ".list") : export_source;
$.post(ctx + "/excel/preExport", {
code : code,
colnames : JSON.stringify(colnames),