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

bug fix

Browse Source
This commit is contained in:
zhuangqian 2016-11-30 16:56:34 +08:00
parent fbd4f06114
commit a6345b0fa6
9 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/smallchill/core/beetl/tag/DropDownTag.java
View File

@ -42,7 +42,7 @@ public class DropDownTag extends Tag {
String codes = param.get("code");
String name = param.get("name");
Object value = param.get("value");
String token = (value.toString().equals("0")) ? "token_" : "";
String token = (value.toString().equals("0")) ? Func.toStr(param.get("token")) : "";
String type = param.get("type");
String required = param.get("required");
int lev = 99;
@ -51,7 +51,7 @@ public class DropDownTag extends Tag {
if (type.equals("dict")) {
code = codes.split("_")[0];
lev = (codes.split("_").length > 1) ? Func.toInt(codes.split("_")[1]) : 99;
sql = "select ID,(case when PID is null then 0 else PID end) PID,NUM,name as TEXT from TFW_DICT where code=" + code + " and num>0";
sql = "select ID,(case when PID is null then 0 else PID end) PID,NUM,name as TEXT from TFW_DICT where code=" + code + " and num > 0 order by num asc";
} else if (type.equals("user")) {
sql = "select ID,ID NUM,0 as PID,name as TEXT from TFW_USER where status=1";
} else if (type.equals("dept")) {

2
src/main/java/com/smallchill/core/beetl/tag/SelectTag.java
View File

@ -48,7 +48,7 @@ public class SelectTag extends Tag {
final String code = param.get("code");
String name = param.get("name");
String value = Func.toStr(param.get("value"));
String token = (StrKit.notBlank(value)) ? "" : "token_";
String token = (StrKit.notBlank(value)) ? "" : Func.toStr(param.get("token"));
String type = param.get("type");
String where = param.get("where");
String required = param.get("required");

4
src/main/java/com/smallchill/core/toolbox/kit/BeanKit.java
View File

@ -12,6 +12,7 @@ import java.util.Map;
import java.util.Map.Entry;
import com.smallchill.core.exception.ToolBoxException;
import com.smallchill.core.toolbox.Func;
import com.smallchill.core.toolbox.support.Convert;
/**
@ -249,11 +250,10 @@ public class BeanKit {
for (PropertyDescriptor property : propertyDescriptors) {
propertyName = property.getName();
value = valueProvider.value(propertyName);
if (null == value) {
if (Func.isEmpty(value)) {
// 此处取得的值为空时跳过，包括null和""
continue;
}
try {
property.getWriteMethod().invoke(bean, Convert.parse(property.getPropertyType(), value));
} catch (Exception e) {

4
src/main/java/com/smallchill/core/toolbox/support/BeanInjector.java
View File

@ -59,7 +59,7 @@ public class BeanInjector {
if (value.length > 1) {
o = CollectionKit.join(value, ",");
} else {
o = (Func.equals(value[0], "")) ? " " : value[0];
o = (Func.equals(value[0], "")) ? "" : value[0];
}
}
map.put(StrKit.removePrefixIgnoreCase(param.getKey(), start).toLowerCase(), o);
@ -85,7 +85,7 @@ public class BeanInjector {
if (value.length > 1) {
o = CollectionKit.join(value, ",");
} else {
o = (Func.equals(value[0], "")) ? " " : value[0];
o = value[0];
}
}
map.put(param.getKey(), o);

20
src/main/webapp/WEB-INF/view/common/_curd/_add.html
View File

@ -37,7 +37,7 @@
@ }
@ else if(func.like(x.type,"select_")) {
@ var num = strutil.replace(x.type, "select_", "");
<blade:select code="${num}" name="${table!x.table}.${x.index!}" value="${x.value!0}" type="dict" tail="${x.tail!}" intercept="${x.intercept!}" required="${x.required!}"/>
<blade:select code="${num}" name="${table!x.table}.${x.index!}" value="${x.value!}" type="dict" tail="${x.tail!}" intercept="${x.intercept!}" required="${x.required!}"/>
@ }
@ else if(func.like(x.type,"combo_")) {
@ var num = strutil.replace(x.type, "combo_", "");
@ -45,34 +45,34 @@
@ }
@ else if(func.like(x.type, "dropdown_")) {
@ var num = strutil.replace(x.type, "dropdown_", "");
<blade:dropdown code="${num}" name="${table!x.table}.${x.index!}" value="${x.value!0}" type="dict" tail="${x.tail!}" intercept="${x.intercept!}" required="${x.required!}"/>
<blade:dropdown code="${num}" name="${table!x.table}.${x.index!}" value="${x.value!}" type="dict" tail="${x.tail!}" intercept="${x.intercept!}" required="${x.required!}"/>
@ }
@ else if(x.type == "kindeditor") {
<blade:kindeditor value="${x.value!}" id="_${x.index}" name="${table!x.table}.${x.index!}" height="${x.height!'200px'}" required="${x.required!}" />
@ }
@ else if(x.type == "selectDiy") {
<blade:select name="${table!x.table}.${x.index!}" value="${x.value!0}" type="diy" source="${x.source!}" tail="${x.tail!}" intercept="${x.intercept!}" required="${x.required!}"/>
<blade:select name="${table!x.table}.${x.index!}" value="${x.value!}" type="diy" source="${x.source!}" tail="${x.tail!}" intercept="${x.intercept!}" required="${x.required!}"/>
@ }
@ else if(x.type == "dropdownDiy") {
<blade:dropdown name="${table!x.table}.${x.index!}" value="${x.value!0}" type="diy" source="${x.source!}" tail="${x.tail!}" intercept="${x.intercept!}" required="${x.required!}"/>
<blade:dropdown name="${table!x.table}.${x.index!}" value="${x.value!}" type="diy" source="${x.source!}" tail="${x.tail!}" intercept="${x.intercept!}" required="${x.required!}"/>
@ }
@ else if(x.type == "selectDept") {
<blade:select name="${table!x.table}.${x.index!}" value="${x.value!0}" type="dept" tail="${x.tail!}" intercept="${x.intercept!}" required="${x.required!}"/>
<blade:select name="${table!x.table}.${x.index!}" value="${x.value!}" type="dept" tail="${x.tail!}" intercept="${x.intercept!}" required="${x.required!}"/>
@ }
@ else if(x.type == "dropdownDept") {
<blade:dropdown name="${table!x.table}.${x.index!}" value="${x.value!0}" type="dept" tail="${x.tail!}" intercept="${x.intercept!}" required="${x.required!}"/>
<blade:dropdown name="${table!x.table}.${x.index!}" value="${x.value!}" type="dept" tail="${x.tail!}" intercept="${x.intercept!}" required="${x.required!}"/>
@ }
@ else if(x.type == "selectRole") {
<blade:select name="${table!x.table}.${x.index!}" value="${x.value!0}" type="role" tail="${x.tail!}" intercept="${x.intercept!}" required="${x.required!}"/>
<blade:select name="${table!x.table}.${x.index!}" value="${x.value!}" type="role" tail="${x.tail!}" intercept="${x.intercept!}" required="${x.required!}"/>
@ }
@ else if(x.type == "dropdownRole") {
<blade:dropdown name="${table!x.table}.${x.index!}" value="${x.value!0}" type="role" tail="${x.tail!}" intercept="${x.intercept!}" required="${x.required!}"/>
<blade:dropdown name="${table!x.table}.${x.index!}" value="${x.value!}" type="role" tail="${x.tail!}" intercept="${x.intercept!}" required="${x.required!}"/>
@ }
@ else if(x.type == "selectUser") {
<blade:select name="${table!x.table}.${x.index!}" value="${x.value!0}" type="user" tail="${x.tail!}" intercept="${x.intercept!}" required="${x.required!}"/>
<blade:select name="${table!x.table}.${x.index!}" value="${x.value!}" type="user" tail="${x.tail!}" intercept="${x.intercept!}" required="${x.required!}"/>
@ }
@ else if(x.type == "dropdownUser") {
<blade:dropdown name="${table!x.table}.${x.index!}" value="${x.value!0}" type="user" tail="${x.tail!}" intercept="${x.intercept!}" required="${x.required!}"/>
<blade:dropdown name="${table!x.table}.${x.index!}" value="${x.value!}" type="user" tail="${x.tail!}" intercept="${x.intercept!}" required="${x.required!}"/>
@ }
@ else if(x.type == "checkbox") {
<blade:checkbox id="_${x.index!}" name="${table!x.table}.${x.index!}" checked="${x.checked!}" disabled="${x.disabled!}" />

35
src/main/webapp/WEB-INF/view/common/_curd/_edit.html
View File

@ -34,26 +34,27 @@
@ if(x.newline){
<div class="form-group" style="display:${display!}">
@ }
@ var token = (isEmpty(x.token)) ? "token_" : "";
<label class="col-sm-2 control-label no-padding-right" > ${x.name!} </label>
<div class="col-sm-${x.length!3}">
@ if(x.type == "text" || x.type == "number" || x.type == "tel" || x.type == "email" || x.type == "url" || x.type == "qq" || x.type == "unionpay" || x.type == "credit" || x.type == "idcard") {
<input type="${x.type!'text'}" id="_${x.index!}" name="token_${table!x.table}.${x.index!}" ${x.required!} ${x.disabled!} value="${x.value!}" placeholder="${placeholder!}" class="form-control" />
<input type="${x.type!'text'}" id="_${x.index!}" name="${token}${table!x.table}.${x.index!}" ${x.required!} ${x.disabled!} value="${x.value!}" placeholder="${placeholder!}" class="form-control" />
@ }
@ else if(x.type == "double") {
<input type="${x.type!'text'}" id="_${x.index!}" name="token_${table!x.table}.${x.index!}" ${x.required!} ${x.disabled!} value="${x.value!}" placeholder="${placeholder!}" class="form-control" />
<input type="${x.type!'text'}" id="_${x.index!}" name="${token}${table!x.table}.${x.index!}" ${x.required!} ${x.disabled!} value="${x.value!}" placeholder="${placeholder!}" class="form-control" />
@ }
@ else if(func.like(x.type, "hidden")) {
<input type="${x.type!'hidden'}" id="_${x.index!}" name="${table!x.table}.${x.index!}" value="${x.value!}" class="form-control" />
@ }
@ else if(x.type == "textarea") {
<textarea id="_${x.index!}" style="height:${x.height!'200px'}" name="token_${table!x.table}.${x.index!}" ${x.required!} ${x.disabled!} value="${x.value!}" placeholder="${placeholder!}" class="form-control"></textarea>
<textarea id="_${x.index!}" style="height:${x.height!'200px'}" name="${token}${table!x.table}.${x.index!}" ${x.required!} ${x.disabled!} value="${x.value!}" placeholder="${placeholder!}" class="form-control"></textarea>
@ }
@ else if(x.type == "image") {
<img id="_${x.index!}" data-type="image" data-auto="${x.auto!}" style="padding:2px; border:1px solid #ccc;cursor:pointer;width:${x.width!'168px'};height:${x.height!'110px'};" name="${table!x.table}.${x.index!}" src="${x.src!}"></img>
@ }
@ else if(func.like(x.type, "select_")) {
@ var num = strutil.replace(x.type, "select_", "");
<blade:select code="${num}" name="${table!x.table}.${x.index!}" value="${x.value!0}" type="dict" tail="${x.tail!}" intercept="${x.intercept!}" required="${x.required!}"/>
<blade:select code="${num}" name="${table!x.table}.${x.index!}" value="${x.value!}" type="dict" tail="${x.tail!}" token="${token}" intercept="${x.intercept!}" required="${x.required!}"/>
@ }
@ else if(func.like(x.type, "combo_")) {
@ var num = strutil.replace(x.type, "combo_", "");
@ -61,34 +62,34 @@
@ }
@ else if(func.like(x.type, "dropdown_")) {
@ var num = strutil.replace(x.type, "dropdown_", "");
<blade:dropdown code="${num}" name="${table!x.table}.${x.index!}" value="${x.value!0}" type="dict" tail="${x.tail!}" intercept="${x.intercept!}" required="${x.required!}"/>
<blade:dropdown code="${num}" name="${table!x.table}.${x.index!}" value="${x.value!}" type="dict" tail="${x.tail!}" intercept="${x.intercept!}" required="${x.required!}"/>
@ }
@ else if(x.type == "kindeditor") {
<blade:kindeditor value="${x.value!}" id="_${x.index}" name="${table!x.table}.${x.index!}" height="${x.height!'200px'}" required="${x.required!}" />
<blade:kindeditor value="${x.value!}" id="_${x.index}" name="${table!x.table}.${x.index!}" height="${x.height!'200px'}" token="${token}" required="${x.required!}" />
@ }
@ else if(x.type == "selectDiy") {
<blade:select name="${table!x.table}.${x.index!}" value="${x.value!0}" type="diy" source="${x.source!}" tail="${x.tail!}" intercept="${x.intercept!}" required="${x.required!}"/>
<blade:select name="${table!x.table}.${x.index!}" value="${x.value!}" type="diy" source="${x.source!}" tail="${x.tail!}" token="${token}" intercept="${x.intercept!}" required="${x.required!}"/>
@ }
@ else if(x.type == "dropdownDiy") {
<blade:dropdown name="${table!x.table}.${x.index!}" value="${x.value!0}" type="diy" source="${x.source!}" tail="${x.tail!}" intercept="${x.intercept!}" required="${x.required!}"/>
<blade:dropdown name="${table!x.table}.${x.index!}" value="${x.value!}" type="diy" source="${x.source!}" tail="${x.tail!}" token="${token}" intercept="${x.intercept!}" required="${x.required!}"/>
@ }
@ else if(x.type == "selectDept") {
<blade:select name="${table!x.table}.${x.index!}" value="${x.value!0}" type="dept" tail="${x.tail!}" intercept="${x.intercept!}" required="${x.required!}"/>
<blade:select name="${table!x.table}.${x.index!}" value="${x.value!}" type="dept" tail="${x.tail!}" token="${token}" intercept="${x.intercept!}" required="${x.required!}"/>
@ }
@ else if(x.type == "dropdownDept") {
<blade:dropdown name="${table!x.table}.${x.index!}" value="${x.value!0}" type="dept" tail="${x.tail!}" intercept="${x.intercept!}" required="${x.required!}"/>
<blade:dropdown name="${table!x.table}.${x.index!}" value="${x.value!}" type="dept" tail="${x.tail!}" token="${token}" intercept="${x.intercept!}" required="${x.required!}"/>
@ }
@ else if(x.type == "selectRole") {
<blade:select name="${table!x.table}.${x.index!}" value="${x.value!0}" type="role" tail="${x.tail!}" intercept="${x.intercept!}" required="${x.required!}"/>
<blade:select name="${table!x.table}.${x.index!}" value="${x.value!}" type="role" tail="${x.tail!}" token="${token}" intercept="${x.intercept!}" required="${x.required!}"/>
@ }
@ else if(x.type == "dropdownRole") {
<blade:dropdown name="${table!x.table}.${x.index!}" value="${x.value!0}" type="role" tail="${x.tail!}" intercept="${x.intercept!}" required="${x.required!}"/>
<blade:dropdown name="${table!x.table}.${x.index!}" value="${x.value!}" type="role" tail="${x.tail!}" token="${token}" intercept="${x.intercept!}" required="${x.required!}"/>
@ }
@ else if(x.type == "selectUser") {
<blade:select name="${table!x.table}.${x.index!}" value="${x.value!0}" type="user" tail="${x.tail!}" intercept="${x.intercept!}" required="${x.required!}"/>
<blade:select name="${table!x.table}.${x.index!}" value="${x.value!}" type="user" tail="${x.tail!}" token="${token}" intercept="${x.intercept!}" required="${x.required!}"/>
@ }
@ else if(x.type == "dropdownUser") {
<blade:dropdown name="${table!x.table}.${x.index!}" value="${x.value!0}" type="user" tail="${x.tail!}" intercept="${x.intercept!}" required="${x.required!}"/>
<blade:dropdown name="${table!x.table}.${x.index!}" value="${x.value!}" type="user" tail="${x.tail!}" token="${token}" intercept="${x.intercept!}" required="${x.required!}"/>
@ }
@ else if(x.type == "checkbox") {
<blade:checkbox id="_${x.index!}" name="${table!x.table}.${x.index!}" checked="${x.checked!}" disabled="${x.disabled!}" />
@ -97,10 +98,10 @@
<blade:checkbox2 id="_${x.index!}" name="${table!x.table}.${x.index!}" checked="${x.checked!}" disabled="${x.disabled!}" />
@ }
@ else if(x.type == "date") {
<blade:date id="_${x.index!}" name="${table!x.table}.${x.index!}" value="${x.value!}" format="${x.format!}" required="${x.required!}" disabled="${x.disabled!}" placeholder="${x.placeholder!'请选择日期'}"/>
<blade:date id="_${x.index!}" name="${table!x.table}.${x.index!}" value="${x.value!}" format="${x.format!}" token="${token}" required="${x.required!}" disabled="${x.disabled!}" placeholder="${x.placeholder!'请选择日期'}"/>
@ }
@ else if(x.type == "laydate") {
<blade:laydate id="_${x.index!}" name="${table!x.table}.${x.index!}" value="${x.value!}" format="${x.format!}" required="${x.required!}" disabled="${x.disabled!}" placeholder="${x.placeholder!'请选择日期'}"/>
<blade:laydate id="_${x.index!}" name="${table!x.table}.${x.index!}" value="${x.value!}" format="${x.format!}" token="${token}" required="${x.required!}" disabled="${x.disabled!}" placeholder="${x.placeholder!'请选择日期'}"/>
@ }
@ else if(x.type == "imgupload") {
<blade:imgupload id="_${x.index!}" name="${table!x.table}.${x.index!}" auto="${x.auto!}" />
@ -118,7 +119,7 @@
<input type="password" id="_${x.index!}" name="${table!x.table}.${x.index!}" ${x.required!} ${x.disabled!} value="${x.value!}" placeholder="${placeholder!}" class="form-control" />
@ }
@ else {
<input type="text" id="_${x.index!}" name="token_${table!x.table}.${x.index!}" ${x.required!} ${x.disabled!} value="${x.value!}" placeholder="${placeholder!}" class="form-control" />
<input type="text" id="_${x.index!}" name="${token}${table!x.table}.${x.index!}" ${x.required!} ${x.disabled!} value="${x.value!}" placeholder="${placeholder!}" class="form-control" />
@ }
</div>
@ if(x.length >= 5){

12
src/main/webapp/WEB-INF/view/common/_widget/date.tag
View File

@ -1,10 +1,10 @@
<link rel="stylesheet" href="${ctxPath}/static/assets/css/datepicker.css" />
<script src="${ctxPath}/static/assets/js/date-time/bootstrap-datepicker.js"></script>
@ var token = "token_";
@ if (value != ""){
@ token = "";
@}
<input type="text" id="${id}" name="${token}${name}" ${required!} ${disabled!} value="${value!}" placeholder="请输入${name!}" data-date-format="${format!'yyyy-mm-dd'}" class="form-control" />
<script src="${ctxPath}/static/assets/js/date-time/bootstrap-datepicker.js"></script>
@ var _token = token!'';
@ if (!isEmpty(value)){
@ _token = "";
@ }
<input type="text" id="${id}" name="${_token}${name}" ${required!} ${disabled!} value="${value!}" placeholder="请输入${name!}" data-date-format="${format!'yyyy-mm-dd'}" class="form-control" />
<script type="text/javascript">
$(function(){
$("#${id}").datepicker({

13
src/main/webapp/WEB-INF/view/common/_widget/kindeditor.tag
View File

@ -9,7 +9,6 @@
var options={
cssPath : '${ctxPath}/static/kindeditor/plugins/code/prettify.css',
uploadJson : '${ctxPath}/kindeditor/upload_json',
//uploadJson : '${ctxPath}/image/upload_blob',
fileManagerJson : '${ctxPath}/kindeditor/file_manager_json',
items: ['source', '|', 'fontname', 'fontsize', '|', 'forecolor', 'bold', 'italic', 'underline', '|', 'justifyleft', 'justifycenter', 'justifyright', '|', 'image', 'multiimage', '|', 'plainpaste', 'wordpaste', '|','fullscreen'],
allowFileManager : true,
@ -26,12 +25,12 @@
});
}
};
@ var token = "token_";
@ if (value != ""){
@ token = "";
@}
var editor = K.create('textarea[name="${token}${name}"]', options);
@ var _token = token!'';
@ if (!isEmpty(value)){
@ _token = "";
@ }
var editor = K.create('textarea[name="${_token}${name}"]', options);
});
</script>
<textarea id="${id}" name="${token}${name}" ${required!} class="form-control" cols="100" rows="8" style="visibility:hidden;width:100%;height:${height!'200px'};">${value!}</textarea>
<textarea id="${id}" name="${_token}${name}" ${required!} class="form-control" cols="100" rows="8" style="visibility:hidden;width:100%;height:${height!'200px'};">${value!}</textarea>

8
src/main/webapp/WEB-INF/view/common/_widget/laydate.tag
View File

@ -18,8 +18,8 @@
});
});
</script>
@ var token = "token_";
@ if (value != ""){
@ token = "";
@ var _token = token!'';
@ if (!isEmpty(value)){
@ _token = "";
@ }
<input type="text" id="${id}" name="${token}${name}" class="form-control" ${required!} ${disabled!} value="${value!}" placeholder="${placeholder!}" />
<input type="text" id="${id}" name="${_token}${name}" class="form-control" ${required!} ${disabled!} value="${value!}" placeholder="${placeholder!}" />