diff --git a/pom.xml b/pom.xml index 4a7c1e7f..f82297c3 100644 --- a/pom.xml +++ b/pom.xml @@ -444,6 +444,8 @@ org.freemarker freemarker ${freemarker.version} + system + ${project.basedir}/src/main/webapp/WEB-INF/lib/freemarker-null-2.3.19.jar diff --git a/src/main/java/org/jeecgframework/web/system/controller/core/DepartController.java b/src/main/java/org/jeecgframework/web/system/controller/core/DepartController.java index e4d0c196..bc811dfc 100644 --- a/src/main/java/org/jeecgframework/web/system/controller/core/DepartController.java +++ b/src/main/java/org/jeecgframework/web/system/controller/core/DepartController.java @@ -182,7 +182,9 @@ public class DepartController extends BaseController { } } else { - message = MutiLangUtil.paramDelFail("common.department"); + + message = MutiLangUtil.paramDelFail("common.department,!"); + } j.setMsg(message); @@ -407,6 +409,10 @@ public class DepartController extends BaseController { } Short[] userstate = new Short[] { Globals.User_Normal, Globals.User_ADMIN }; cq.in("status", userstate); + + //cq.eq("deleteFlag", Globals.Delete_Normal);//删除状态，不删除 + //cq.eq("userType",Globals.USER_TYPE_SYSTEM);//系统用户 + cq.add(); this.systemService.getDataGridReturn(cq, true); TagUtil.datagrid(response, dataGrid); @@ -487,6 +493,10 @@ public class DepartController extends BaseController { subCq.add(); cq.add(Property.forName("id").notIn(subCq.getDetachedCriteria())); + + cq.eq("deleteFlag", Globals.Delete_Normal);//删除状态，不删除 + cq.eq("userType",Globals.USER_TYPE_SYSTEM);//系统用户 + cq.add(); this.systemService.getDataGridReturn(cq, true); diff --git a/src/main/java/org/jeecgframework/web/system/controller/core/RoleController.java b/src/main/java/org/jeecgframework/web/system/controller/core/RoleController.java index c0a80b5d..6b3512eb 100644 --- a/src/main/java/org/jeecgframework/web/system/controller/core/RoleController.java +++ b/src/main/java/org/jeecgframework/web/system/controller/core/RoleController.java @@ -265,9 +265,11 @@ public class RoleController extends BaseController { AjaxJson j = new AjaxJson(); if (StringUtil.isNotEmpty(role.getId())) { message = "角色: " + role.getRoleName() + "被更新成功"; + + role.setRoleType(OrgConstants.SYSTEM_ROLE_TYPE); + userService.saveOrUpdate(role); - systemService.addLog(message, Globals.Log_Type_UPDATE, - Globals.Log_Leavel_INFO); + systemService.addLog(message, Globals.Log_Type_UPDATE,Globals.Log_Leavel_INFO); } else { message = "角色: " + role.getRoleName() + "被添加成功"; @@ -962,8 +964,8 @@ public class RoleController extends BaseController { cq.add(Property.forName("id").notIn(subCq.getDetachedCriteria())); - cq.eq("deleteFlag", new Short("0"));//删除状态，不删除 - cq.eq("userType","1");//系统用户 + cq.eq("deleteFlag", Globals.Delete_Normal);//删除状态，不删除 + cq.eq("userType",Globals.USER_TYPE_SYSTEM);//系统用户 cq.add(); diff --git a/src/main/java/org/jeecgframework/web/system/controller/core/TSInterfaceController.java b/src/main/java/org/jeecgframework/web/system/controller/core/TSInterfaceController.java index 6d34afa1..5e3f94f3 100644 --- a/src/main/java/org/jeecgframework/web/system/controller/core/TSInterfaceController.java +++ b/src/main/java/org/jeecgframework/web/system/controller/core/TSInterfaceController.java @@ -165,6 +165,10 @@ public class TSInterfaceController extends BaseController { }else{ String sql = "delete from t_s_interface where id = ?"; systemService.executeSql(sql, tsInterface.getId()); + + String interroleSql = "delete from t_s_interrole_interface where interface_id = ?"; + systemService.executeSql(interroleSql, tsInterface.getId()); + message = MutiLangUtil.paramDelSuccess("common.menu"); systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); } diff --git a/src/main/java/org/jeecgframework/web/system/controller/core/UserController.java b/src/main/java/org/jeecgframework/web/system/controller/core/UserController.java index 2098fbca..c68b30f6 100644 --- a/src/main/java/org/jeecgframework/web/system/controller/core/UserController.java +++ b/src/main/java/org/jeecgframework/web/system/controller/core/UserController.java @@ -888,7 +888,28 @@ public class UserController extends BaseController { req.setAttribute("user", user); idandname(req, user); getOrgInfos(req, user); + + }else{ + //组织机构关联用户录入 + String departid = oConvertUtils.getString(req.getParameter("departid")); + if(StringUtils.isNotEmpty(departid)){ + TSDepart depart = systemService.getEntity(TSDepart.class,departid); + if(depart!=null){ + req.setAttribute("orgIds", depart.getId()+","); + req.setAttribute("departname", depart.getDepartname()+","); + } + } + //角色管理关联用户录入 + String roleId = oConvertUtils.getString(req.getParameter("roleId")); + if(StringUtils.isNotEmpty(roleId)){ + TSRole tsRole = systemService.getEntity(TSRole.class,roleId); + if(tsRole!=null){ + req.setAttribute("id", roleId); + req.setAttribute("roleName", tsRole.getRoleName()); + } + } } + req.setAttribute("tsDepart", tsDepart); //req.setAttribute("orgIdList", JSON.toJSON(orgIdList)); diff --git a/src/main/java/org/jeecgframework/web/system/service/impl/FunctionServiceImpl.java b/src/main/java/org/jeecgframework/web/system/service/impl/FunctionServiceImpl.java index 52c841ab..c6d8c822 100644 --- a/src/main/java/org/jeecgframework/web/system/service/impl/FunctionServiceImpl.java +++ b/src/main/java/org/jeecgframework/web/system/service/impl/FunctionServiceImpl.java @@ -26,27 +26,29 @@ public class FunctionServiceImpl extends CommonServiceImpl implements FunctionSe TSFunction parent = function.getTSFunction(); try { + List listFunction = function.getTSFunctions(); if (listFunction != null && listFunction.size() > 0) { - message = "菜单【" + function.getFunctionName() + "】存在下级菜单，不能删除"; + message = "菜单【" + MutiLangUtil.getLang(function.getFunctionName()) + "】存在下级菜单，不能删除"; j.setMsg(message); j.setSuccess(false); return j; } List op = this.findHql("from TSOperation where TSFunction.id = ?", functionId); if (op != null && op.size() > 0) { - message = "菜单【" + function.getFunctionName() + "】有设置页面权限，不能删除"; + message = "菜单【" + MutiLangUtil.getLang(function.getFunctionName()) + "】有设置页面权限，不能删除"; j.setMsg(message); j.setSuccess(false); return j; } List tsdr = this.findByProperty(TSDataRule.class, "TSFunction", function); if (tsdr != null && tsdr.size() > 0) { - message = "菜单【" + function.getFunctionName() + "】存在数据规则，不能删除"; + message = "菜单【" + MutiLangUtil.getLang(function.getFunctionName()) + "】存在数据规则，不能删除"; j.setMsg(message); j.setSuccess(false); return j; } + if (parent != null) { parent.getTSFunctions().remove(function); } diff --git a/src/main/resources/jeecg/ext-common-template/bootstrap/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai b/src/main/resources/jeecg/ext-common-template/bootstrap/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai index 7b9a1dee..1aa2cbce 100644 --- a/src/main/resources/jeecg/ext-common-template/bootstrap/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai +++ b/src/main/resources/jeecg/ext-common-template/bootstrap/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai @@ -1,3 +1,4 @@ +<#include "/ui/excel.ftl"/> package ${bussiPackage}.${entityPackage}.entity; import java.math.BigDecimal; @@ -36,9 +37,9 @@ public class ${entityName}Entity implements java.io.Serializable { <#list columns as po> /**${po.content}*/ <#if po.isShow != 'N'> - <#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> - @Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"<#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"<#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}") - <#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> + <#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> + <@excel po = po/> + <#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> <#if po.type == "javax.xml.soap.Text"> private java.lang.String ${po.fieldName}; diff --git a/src/main/resources/jeecg/ext-common-template/bootstrap/onetomany/java/subEntity.ftl b/src/main/resources/jeecg/ext-common-template/bootstrap/onetomany/java/subEntity.ftl index 9a24b169..fa6113b0 100644 --- a/src/main/resources/jeecg/ext-common-template/bootstrap/onetomany/java/subEntity.ftl +++ b/src/main/resources/jeecg/ext-common-template/bootstrap/onetomany/java/subEntity.ftl @@ -1,3 +1,4 @@ +<#include "/ui/excel.ftl"/> <#list subtables as key> #segment#${subsG['${key}'].entityName}Entity.java package ${bussiPackage}.${entityPackage}.entity; @@ -37,7 +38,9 @@ public class ${subsG['${key}'].entityName}Entity implements java.io.Serializable <#list subColumnsMap['${key}'] as po> /**${po.content}*/ <#if po.isShow != 'N'> - @Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"<#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"<#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}") + <#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> + <@excel po = po/> + <#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> <#if po.type == "javax.xml.soap.Text"> private java.lang.String ${po.fieldName}; diff --git a/src/main/resources/jeecg/ext-common-template/bootstrap/single/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai b/src/main/resources/jeecg/ext-common-template/bootstrap/single/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai index aec7a73f..d823b056 100644 --- a/src/main/resources/jeecg/ext-common-template/bootstrap/single/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai +++ b/src/main/resources/jeecg/ext-common-template/bootstrap/single/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai @@ -1,3 +1,4 @@ +<#include "/ui/excel.ftl"/> package ${bussiPackage}.${entityPackage}.entity; import java.math.BigDecimal; @@ -36,7 +37,9 @@ public class ${entityName}Entity implements java.io.Serializable { <#list columns as po> /**${po.content}*/ <#if po.isShow != 'N'> - @Excel(name="${po.content}",width=15<#if po.type == "java.util.Date"><#if po.showType=='date'>,format = "yyyy-MM-dd"<#else>,format = "yyyy-MM-dd HH:mm:ss"<#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"<#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}") + <#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> + <@excel po = po/> + <#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> private <#if po.type=='java.sql.Blob'>byte[]<#else>${po.type} ${po.fieldName}; diff --git a/src/main/resources/jeecg/ext-common-template/bootstraptable/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai b/src/main/resources/jeecg/ext-common-template/bootstraptable/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai index 7b9a1dee..1aa2cbce 100644 --- a/src/main/resources/jeecg/ext-common-template/bootstraptable/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai +++ b/src/main/resources/jeecg/ext-common-template/bootstraptable/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai @@ -1,3 +1,4 @@ +<#include "/ui/excel.ftl"/> package ${bussiPackage}.${entityPackage}.entity; import java.math.BigDecimal; @@ -36,9 +37,9 @@ public class ${entityName}Entity implements java.io.Serializable { <#list columns as po> /**${po.content}*/ <#if po.isShow != 'N'> - <#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> - @Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"<#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"<#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}") - <#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> + <#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> + <@excel po = po/> + <#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> <#if po.type == "javax.xml.soap.Text"> private java.lang.String ${po.fieldName}; diff --git a/src/main/resources/jeecg/ext-common-template/bootstraptable/onetomany/java/subEntity.ftl b/src/main/resources/jeecg/ext-common-template/bootstraptable/onetomany/java/subEntity.ftl index 9a24b169..fa6113b0 100644 --- a/src/main/resources/jeecg/ext-common-template/bootstraptable/onetomany/java/subEntity.ftl +++ b/src/main/resources/jeecg/ext-common-template/bootstraptable/onetomany/java/subEntity.ftl @@ -1,3 +1,4 @@ +<#include "/ui/excel.ftl"/> <#list subtables as key> #segment#${subsG['${key}'].entityName}Entity.java package ${bussiPackage}.${entityPackage}.entity; @@ -37,7 +38,9 @@ public class ${subsG['${key}'].entityName}Entity implements java.io.Serializable <#list subColumnsMap['${key}'] as po> /**${po.content}*/ <#if po.isShow != 'N'> - @Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"<#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"<#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}") + <#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> + <@excel po = po/> + <#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> <#if po.type == "javax.xml.soap.Text"> private java.lang.String ${po.fieldName}; diff --git a/src/main/resources/jeecg/ext-common-template/bootstraptable/onetomany/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}List.jspi b/src/main/resources/jeecg/ext-common-template/bootstraptable/onetomany/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}List.jspi index 673444fb..edf4f38c 100644 --- a/src/main/resources/jeecg/ext-common-template/bootstraptable/onetomany/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}List.jspi +++ b/src/main/resources/jeecg/ext-common-template/bootstraptable/onetomany/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}List.jspi @@ -444,6 +444,9 @@ } } } + if(showVal==''){ + showVal = value; + } return showVal; } diff --git a/src/main/resources/jeecg/ext-common-template/bootstraptable/single/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai b/src/main/resources/jeecg/ext-common-template/bootstraptable/single/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai index aec7a73f..d823b056 100644 --- a/src/main/resources/jeecg/ext-common-template/bootstraptable/single/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai +++ b/src/main/resources/jeecg/ext-common-template/bootstraptable/single/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai @@ -1,3 +1,4 @@ +<#include "/ui/excel.ftl"/> package ${bussiPackage}.${entityPackage}.entity; import java.math.BigDecimal; @@ -36,7 +37,9 @@ public class ${entityName}Entity implements java.io.Serializable { <#list columns as po> /**${po.content}*/ <#if po.isShow != 'N'> - @Excel(name="${po.content}",width=15<#if po.type == "java.util.Date"><#if po.showType=='date'>,format = "yyyy-MM-dd"<#else>,format = "yyyy-MM-dd HH:mm:ss"<#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"<#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}") + <#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> + <@excel po = po/> + <#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> private <#if po.type=='java.sql.Blob'>byte[]<#else>${po.type} ${po.fieldName}; diff --git a/src/main/resources/jeecg/ext-common-template/bootstraptable/single/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}List.jspi b/src/main/resources/jeecg/ext-common-template/bootstraptable/single/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}List.jspi index 06266d7d..c3108650 100644 --- a/src/main/resources/jeecg/ext-common-template/bootstraptable/single/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}List.jspi +++ b/src/main/resources/jeecg/ext-common-template/bootstraptable/single/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}List.jspi @@ -442,6 +442,9 @@ } } } + if(showVal==''){ + showVal = value; + } return showVal; } diff --git a/src/main/resources/jeecg/ext-common-template/bootstraptableUI/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai b/src/main/resources/jeecg/ext-common-template/bootstraptableUI/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai index 7b9a1dee..1aa2cbce 100644 --- a/src/main/resources/jeecg/ext-common-template/bootstraptableUI/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai +++ b/src/main/resources/jeecg/ext-common-template/bootstraptableUI/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai @@ -1,3 +1,4 @@ +<#include "/ui/excel.ftl"/> package ${bussiPackage}.${entityPackage}.entity; import java.math.BigDecimal; @@ -36,9 +37,9 @@ public class ${entityName}Entity implements java.io.Serializable { <#list columns as po> /**${po.content}*/ <#if po.isShow != 'N'> - <#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> - @Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"<#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"<#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}") - <#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> + <#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> + <@excel po = po/> + <#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> <#if po.type == "javax.xml.soap.Text"> private java.lang.String ${po.fieldName}; diff --git a/src/main/resources/jeecg/ext-common-template/bootstraptableUI/onetomany/java/subEntity.ftl b/src/main/resources/jeecg/ext-common-template/bootstraptableUI/onetomany/java/subEntity.ftl index 9a24b169..2fc4ea49 100644 --- a/src/main/resources/jeecg/ext-common-template/bootstraptableUI/onetomany/java/subEntity.ftl +++ b/src/main/resources/jeecg/ext-common-template/bootstraptableUI/onetomany/java/subEntity.ftl @@ -1,3 +1,4 @@ +<#include "/ui/excel.ftl"/> <#list subtables as key> #segment#${subsG['${key}'].entityName}Entity.java package ${bussiPackage}.${entityPackage}.entity; @@ -37,7 +38,9 @@ public class ${subsG['${key}'].entityName}Entity implements java.io.Serializable <#list subColumnsMap['${key}'] as po> /**${po.content}*/ <#if po.isShow != 'N'> - @Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"<#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"<#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}") + <#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> + <@excel po = po/> + <#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> <#if po.type == "javax.xml.soap.Text"> private java.lang.String ${po.fieldName}; diff --git a/src/main/resources/jeecg/ext-common-template/bootstraptableUI/single/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai b/src/main/resources/jeecg/ext-common-template/bootstraptableUI/single/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai index aec7a73f..d823b056 100644 --- a/src/main/resources/jeecg/ext-common-template/bootstraptableUI/single/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai +++ b/src/main/resources/jeecg/ext-common-template/bootstraptableUI/single/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai @@ -1,3 +1,4 @@ +<#include "/ui/excel.ftl"/> package ${bussiPackage}.${entityPackage}.entity; import java.math.BigDecimal; @@ -36,7 +37,9 @@ public class ${entityName}Entity implements java.io.Serializable { <#list columns as po> /**${po.content}*/ <#if po.isShow != 'N'> - @Excel(name="${po.content}",width=15<#if po.type == "java.util.Date"><#if po.showType=='date'>,format = "yyyy-MM-dd"<#else>,format = "yyyy-MM-dd HH:mm:ss"<#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"<#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}") + <#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> + <@excel po = po/> + <#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> private <#if po.type=='java.sql.Blob'>byte[]<#else>${po.type} ${po.fieldName}; diff --git a/src/main/resources/jeecg/ext-common-template/element/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai b/src/main/resources/jeecg/ext-common-template/element/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai index d1403070..8909ac48 100644 --- a/src/main/resources/jeecg/ext-common-template/element/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai +++ b/src/main/resources/jeecg/ext-common-template/element/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai @@ -1,3 +1,4 @@ +<#include "/ui/excel.ftl"/> package ${bussiPackage}.${entityPackage}.entity; import java.math.BigDecimal; @@ -39,9 +40,9 @@ public class ${entityName}Entity implements java.io.Serializable { <#list columns as po> /**${po.content}*/ <#if po.isShow != 'N'> - <#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> - @Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"<#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"<#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}") - <#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> + <#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> + <@excel po = po/> + <#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> <#--update-start--Author:luobaoli Date:20150609 for：将数据库中blob类型对应为byte[]--> private <#if po.type=='java.sql.Blob'>byte[]<#else>${po.type} ${po.fieldName}; diff --git a/src/main/resources/jeecg/ext-common-template/element/onetomany/java/subEntity.ftl b/src/main/resources/jeecg/ext-common-template/element/onetomany/java/subEntity.ftl index 641b8e8e..7695a4ca 100644 --- a/src/main/resources/jeecg/ext-common-template/element/onetomany/java/subEntity.ftl +++ b/src/main/resources/jeecg/ext-common-template/element/onetomany/java/subEntity.ftl @@ -1,3 +1,4 @@ +<#include "/ui/excel.ftl"/> <#list subtables as key> #segment#${subsG['${key}'].entityName}Entity.java @@ -38,9 +39,9 @@ public class ${subsG['${key}'].entityName}Entity implements java.io.Serializable <#list subColumnsMap['${key}'] as po> /**${po.content}*/ <#if po.isShow != 'N'> - <#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> - @Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"<#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"<#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}") - <#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> + <#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> + <@excel po = po/> + <#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> <#if po.type == "javax.xml.soap.Text"> private java.lang.String ${po.fieldName}; diff --git a/src/main/resources/jeecg/ext-common-template/element/single/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai b/src/main/resources/jeecg/ext-common-template/element/single/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai index d1403070..8909ac48 100644 --- a/src/main/resources/jeecg/ext-common-template/element/single/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai +++ b/src/main/resources/jeecg/ext-common-template/element/single/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai @@ -1,3 +1,4 @@ +<#include "/ui/excel.ftl"/> package ${bussiPackage}.${entityPackage}.entity; import java.math.BigDecimal; @@ -39,9 +40,9 @@ public class ${entityName}Entity implements java.io.Serializable { <#list columns as po> /**${po.content}*/ <#if po.isShow != 'N'> - <#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> - @Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"<#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"<#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}") - <#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> + <#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> + <@excel po = po/> + <#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> <#--update-start--Author:luobaoli Date:20150609 for：将数据库中blob类型对应为byte[]--> private <#if po.type=='java.sql.Blob'>byte[]<#else>${po.type} ${po.fieldName}; diff --git a/src/main/resources/jeecg/ext-common-template/multitable/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai b/src/main/resources/jeecg/ext-common-template/multitable/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai index 7b9a1dee..1aa2cbce 100644 --- a/src/main/resources/jeecg/ext-common-template/multitable/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai +++ b/src/main/resources/jeecg/ext-common-template/multitable/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai @@ -1,3 +1,4 @@ +<#include "/ui/excel.ftl"/> package ${bussiPackage}.${entityPackage}.entity; import java.math.BigDecimal; @@ -36,9 +37,9 @@ public class ${entityName}Entity implements java.io.Serializable { <#list columns as po> /**${po.content}*/ <#if po.isShow != 'N'> - <#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> - @Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"<#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"<#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}") - <#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> + <#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> + <@excel po = po/> + <#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> <#if po.type == "javax.xml.soap.Text"> private java.lang.String ${po.fieldName}; diff --git a/src/main/resources/jeecg/ext-common-template/multitable/onetomany/java/subEntity.ftl b/src/main/resources/jeecg/ext-common-template/multitable/onetomany/java/subEntity.ftl index 80b17ee7..98ecf8ae 100644 --- a/src/main/resources/jeecg/ext-common-template/multitable/onetomany/java/subEntity.ftl +++ b/src/main/resources/jeecg/ext-common-template/multitable/onetomany/java/subEntity.ftl @@ -1,3 +1,4 @@ +<#include "/ui/excel.ftl"/> <#list subtables as key> #segment#${subsG['${key}'].entityName}Entity.java package ${bussiPackage}.${subsG['${key}'].entityPackage}.entity; @@ -38,9 +39,9 @@ public class ${subsG['${key}'].entityName}Entity implements java.io.Serializable <#list subColumnsMap['${key}'] as po> /**${po.content}*/ <#if po.isShow != 'N'> - <#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> - @Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"<#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"<#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}") - <#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> + <#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> + <@excel po = po/> + <#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> <#if po.type == "javax.xml.soap.Text"> private java.lang.String ${po.fieldName}; diff --git a/src/main/resources/jeecg/ext-common-template/naturebt/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai b/src/main/resources/jeecg/ext-common-template/naturebt/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai index 7b9a1dee..1aa2cbce 100644 --- a/src/main/resources/jeecg/ext-common-template/naturebt/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai +++ b/src/main/resources/jeecg/ext-common-template/naturebt/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai @@ -1,3 +1,4 @@ +<#include "/ui/excel.ftl"/> package ${bussiPackage}.${entityPackage}.entity; import java.math.BigDecimal; @@ -36,9 +37,9 @@ public class ${entityName}Entity implements java.io.Serializable { <#list columns as po> /**${po.content}*/ <#if po.isShow != 'N'> - <#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> - @Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"<#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"<#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}") - <#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> + <#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> + <@excel po = po/> + <#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> <#if po.type == "javax.xml.soap.Text"> private java.lang.String ${po.fieldName}; diff --git a/src/main/resources/jeecg/ext-common-template/naturebt/onetomany/java/subEntity.ftl b/src/main/resources/jeecg/ext-common-template/naturebt/onetomany/java/subEntity.ftl index 641b8e8e..7695a4ca 100644 --- a/src/main/resources/jeecg/ext-common-template/naturebt/onetomany/java/subEntity.ftl +++ b/src/main/resources/jeecg/ext-common-template/naturebt/onetomany/java/subEntity.ftl @@ -1,3 +1,4 @@ +<#include "/ui/excel.ftl"/> <#list subtables as key> #segment#${subsG['${key}'].entityName}Entity.java @@ -38,9 +39,9 @@ public class ${subsG['${key}'].entityName}Entity implements java.io.Serializable <#list subColumnsMap['${key}'] as po> /**${po.content}*/ <#if po.isShow != 'N'> - <#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> - @Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"<#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"<#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}") - <#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> + <#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> + <@excel po = po/> + <#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> <#if po.type == "javax.xml.soap.Text"> private java.lang.String ${po.fieldName}; diff --git a/src/main/resources/jeecg/ext-common-template/naturebt/onetomany/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}List.jspi b/src/main/resources/jeecg/ext-common-template/naturebt/onetomany/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}List.jspi index d4fd14df..08d3f45e 100644 --- a/src/main/resources/jeecg/ext-common-template/naturebt/onetomany/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}List.jspi +++ b/src/main/resources/jeecg/ext-common-template/naturebt/onetomany/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}List.jspi @@ -10,6 +10,7 @@ + ${ftl_description} @@ -380,7 +381,7 @@ function listDictFormat(value,code,table){ } var dicts = ${entityName?uncap_first}ListdictsData[dictKey]; var valArray = value.split(','); - var showVal = value; + var showVal = ''; if (valArray.length > 1) { for (var k = 0; k < valArray.length; k++) { if(dicts && dicts.length>0){ @@ -403,6 +404,9 @@ function listDictFormat(value,code,table){ } } } + if(showVal==''){ + showVal = value; + } return showVal; } diff --git a/src/main/resources/jeecg/ext-common-template/naturebt/single/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai b/src/main/resources/jeecg/ext-common-template/naturebt/single/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai index d647e708..38297319 100644 --- a/src/main/resources/jeecg/ext-common-template/naturebt/single/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai +++ b/src/main/resources/jeecg/ext-common-template/naturebt/single/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai @@ -1,3 +1,4 @@ +<#include "/ui/excel.ftl"/> package ${bussiPackage}.${entityPackage}.entity; import java.math.BigDecimal; @@ -36,9 +37,9 @@ public class ${entityName}Entity implements java.io.Serializable { <#list columns as po> /**${po.content}*/ <#if po.isShow != 'N'> - <#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> - @Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"<#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"<#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}") - <#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> + <#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> + <@excel po = po/> + <#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> <#--update-start--Author:luobaoli Date:20150609 for：将数据库中blob类型对应为byte[]--> private <#if po.type=='java.sql.Blob'>byte[]<#else>${po.type} ${po.fieldName}; diff --git a/src/main/resources/jeecg/ext-common-template/naturebt/single/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}List.jspi b/src/main/resources/jeecg/ext-common-template/naturebt/single/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}List.jspi index 164781a9..2dc3717f 100644 --- a/src/main/resources/jeecg/ext-common-template/naturebt/single/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}List.jspi +++ b/src/main/resources/jeecg/ext-common-template/naturebt/single/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}List.jspi @@ -10,6 +10,7 @@ + ${ftl_description} @@ -378,7 +379,7 @@ function listDictFormat(value,code,table){ } var dicts = ${entityName?uncap_first}ListdictsData[dictKey]; var valArray = value.split(','); - var showVal = value; + var showVal = ''; if (valArray.length > 1) { for (var k = 0; k < valArray.length; k++) { if(dicts && dicts.length>0){ @@ -401,6 +402,9 @@ function listDictFormat(value,code,table){ } } } + if(showVal==''){ + showVal = value; + } return showVal; } diff --git a/src/main/resources/jeecg/ext-common-template/table/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai b/src/main/resources/jeecg/ext-common-template/table/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai index 7b9a1dee..1aa2cbce 100644 --- a/src/main/resources/jeecg/ext-common-template/table/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai +++ b/src/main/resources/jeecg/ext-common-template/table/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai @@ -1,3 +1,4 @@ +<#include "/ui/excel.ftl"/> package ${bussiPackage}.${entityPackage}.entity; import java.math.BigDecimal; @@ -36,9 +37,9 @@ public class ${entityName}Entity implements java.io.Serializable { <#list columns as po> /**${po.content}*/ <#if po.isShow != 'N'> - <#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> - @Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"<#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"<#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}") - <#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> + <#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> + <@excel po = po/> + <#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> <#if po.type == "javax.xml.soap.Text"> private java.lang.String ${po.fieldName}; diff --git a/src/main/resources/jeecg/ext-common-template/table/onetomany/java/subEntity.ftl b/src/main/resources/jeecg/ext-common-template/table/onetomany/java/subEntity.ftl index b752c87a..5bc985c7 100644 --- a/src/main/resources/jeecg/ext-common-template/table/onetomany/java/subEntity.ftl +++ b/src/main/resources/jeecg/ext-common-template/table/onetomany/java/subEntity.ftl @@ -1,3 +1,4 @@ +<#include "/ui/excel.ftl"/> <#list subtables as key> #segment#${subsG['${key}'].entityName}Entity.java @@ -40,9 +41,9 @@ public class ${subsG['${key}'].entityName}Entity implements java.io.Serializable <#list subColumnsMap['${key}'] as po> /**${po.content}*/ <#if po.isShow != 'N'> - <#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> - @Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"<#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"<#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}") - <#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> + <#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> + <@excel po = po/> + <#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> <#if po.type == "javax.xml.soap.Text"> private java.lang.String ${po.fieldName}; diff --git a/src/main/resources/jeecg/ext-common-template/table/single/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai b/src/main/resources/jeecg/ext-common-template/table/single/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai index d647e708..38297319 100644 --- a/src/main/resources/jeecg/ext-common-template/table/single/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai +++ b/src/main/resources/jeecg/ext-common-template/table/single/java/${bussiPackage}/${entityPackage}/entity/${entityName}Entity.javai @@ -1,3 +1,4 @@ +<#include "/ui/excel.ftl"/> package ${bussiPackage}.${entityPackage}.entity; import java.math.BigDecimal; @@ -36,9 +37,9 @@ public class ${entityName}Entity implements java.io.Serializable { <#list columns as po> /**${po.content}*/ <#if po.isShow != 'N'> - <#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> - @Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"<#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"<#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}") - <#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> + <#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> + <@excel po = po/> + <#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> <#--update-start--Author:luobaoli Date:20150609 for：将数据库中blob类型对应为byte[]--> private <#if po.type=='java.sql.Blob'>byte[]<#else>${po.type} ${po.fieldName}; diff --git a/src/main/resources/jeecg/ext-common-template/ui/excel.ftl b/src/main/resources/jeecg/ext-common-template/ui/excel.ftl new file mode 100644 index 00000000..d84b267b --- /dev/null +++ b/src/main/resources/jeecg/ext-common-template/ui/excel.ftl @@ -0,0 +1,17 @@ +<#-- 实体属性@Excel注解 --> +<#macro excel po> + @Excel(name="${po.content}",width=15<#rt/> +<#if po.type == "java.util.Date"> +<#if po.showType=='date'> +,format = "yyyy-MM-dd"<#rt/> +<#else> +,format = "yyyy-MM-dd HH:mm:ss"<#rt/> + + +<#if po.dictTable?if_exists?html!="" && po.showType?if_exists?html!='popup'> +,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"<#rt/> + +<#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!=""> +,dicCode="${po.dictField}"<#rt/> +) + \ No newline at end of file diff --git a/src/main/resources/jeecg/ext-common-template/ui/tdgColcb.ftl b/src/main/resources/jeecg/ext-common-template/ui/tdgColcb.ftl index 7e8762cb..da0cab39 100644 --- a/src/main/resources/jeecg/ext-common-template/ui/tdgColcb.ftl +++ b/src/main/resources/jeecg/ext-common-template/ui/tdgColcb.ftl @@ -16,12 +16,16 @@ <#rt/> <#if po.dictTable?if_exists?html!=""><#rt/> dictionary="${po.dictTable},${po.dictField?replace(',', '@')},${po.dictText?replace(',', '@')}" <#rt/> - <#if po.showType=='popup'> popup="true" extendParams="editor:'text'"<#else> extendParams="editor:'combobox'"<#rt/> - <#else><#rt/> - <#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!=""><#rt/> + <#if po.showType=='popup'> + popup="true" extendParams="editor:{type:'popupty',options:{dicTable:'${po.dictTable}',dicText:'${po.dictText?replace(',', '@')}'}}" <#rt/> + <#else> + extendParams="editor:'combobox'"<#rt/> + <#rt/> + <#else><#rt/> + <#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!=""><#rt/> dictionary="${po.dictField}" filterType="combobox" extendParams="editor:'combobox'"<#rt/> - <#else> - <#if po.type?if_exists?html =='java.util.Date'><#rt/> + <#else> + <#if po.type?if_exists?html =='java.util.Date'><#rt/> filterType="datebox" extendParams="editor:{type:'datebox',options:{onShowPanel:initDateboxformat}}"<#rt/> <#elseif po.type?if_exists?html =='java.lang.Integer'><#rt/> filterType="numberbox" extendParams="editor:'numberbox'"<#rt/> diff --git a/src/main/resources/jeecg/ext-template/ace/onetomany/cgform_entityTemplate.ftl b/src/main/resources/jeecg/ext-template/ace/onetomany/cgform_entityTemplate.ftl index 48cabbfe..ba2fc346 100644 --- a/src/main/resources/jeecg/ext-template/ace/onetomany/cgform_entityTemplate.ftl +++ b/src/main/resources/jeecg/ext-template/ace/onetomany/cgform_entityTemplate.ftl @@ -1,3 +1,4 @@ +<#include "../../ui/excel.ftl"/> <#if packageStyle == "service"> package ${bussiPackage}.${entityPackage}.entity; <#else> @@ -39,9 +40,9 @@ public class ${entityName}Entity implements java.io.Serializable { <#list columns as po> /**${po.content}*/ <#if po.isShow != 'N'> - <#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> - @Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"<#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"<#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}") - <#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> + <#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> + <@excel po = po/> + <#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> <#if po.type == "javax.xml.soap.Text"> private java.lang.String ${po.fieldName}; diff --git a/src/main/resources/jeecg/ext-template/ace/single/cgform_entityTemplate.ftl b/src/main/resources/jeecg/ext-template/ace/single/cgform_entityTemplate.ftl index c984ea4c..7e8a4a39 100644 --- a/src/main/resources/jeecg/ext-template/ace/single/cgform_entityTemplate.ftl +++ b/src/main/resources/jeecg/ext-template/ace/single/cgform_entityTemplate.ftl @@ -1,3 +1,4 @@ +<#include "../../ui/excel.ftl"/> <#if packageStyle == "service"> package ${bussiPackage}.${entityPackage}.entity; <#else> @@ -40,9 +41,10 @@ public class ${entityName}Entity implements java.io.Serializable { <#list columns as po> /**${po.content}*/ <#if po.isShow != 'N'> - <#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> - @Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"<#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"<#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}") - <#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> + <#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> + <@excel po = po/> + <#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> + <#--update-start--Author:luobaoli Date:20150609 for：将数据库中blob类型对应为byte[]--> private <#if po.type=='java.sql.Blob'>byte[]<#else>${po.type} ${po.fieldName}; <#--update-end--Author:luobaoli Date:20150609 for：将数据库中blob类型对应为byte[]--> diff --git a/src/main/resources/jeecg/ext-template/div/single/cgform_entityTemplate.ftl b/src/main/resources/jeecg/ext-template/div/single/cgform_entityTemplate.ftl index 22b24654..7e8a4a39 100644 --- a/src/main/resources/jeecg/ext-template/div/single/cgform_entityTemplate.ftl +++ b/src/main/resources/jeecg/ext-template/div/single/cgform_entityTemplate.ftl @@ -1,3 +1,4 @@ +<#include "../../ui/excel.ftl"/> <#if packageStyle == "service"> package ${bussiPackage}.${entityPackage}.entity; <#else> @@ -40,9 +41,9 @@ public class ${entityName}Entity implements java.io.Serializable { <#list columns as po> /**${po.content}*/ <#if po.isShow != 'N'> - <#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> - @Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"<#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"<#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}") - <#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> + <#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> + <@excel po = po/> + <#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> <#--update-start--Author:luobaoli Date:20150609 for：将数据库中blob类型对应为byte[]--> private <#if po.type=='java.sql.Blob'>byte[]<#else>${po.type} ${po.fieldName}; diff --git a/src/main/resources/jeecg/ext-template/nopop/single/cgform_entityTemplate.ftl b/src/main/resources/jeecg/ext-template/nopop/single/cgform_entityTemplate.ftl index 4570604d..ab05ef71 100644 --- a/src/main/resources/jeecg/ext-template/nopop/single/cgform_entityTemplate.ftl +++ b/src/main/resources/jeecg/ext-template/nopop/single/cgform_entityTemplate.ftl @@ -1,3 +1,4 @@ +<#include "../../ui/excel.ftl"/> <#if packageStyle == "service"> package ${bussiPackage}.${entityPackage}.entity; <#else> @@ -40,9 +41,9 @@ public class ${entityName}Entity implements java.io.Serializable { <#list columns as po> /**${po.content}*/ <#if po.isShow != 'N'> - <#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> - @Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"<#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"<#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}") - <#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> + <#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> + <@excel po = po/> + <#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> <#--update-start--Author:luobaoli Date:20150609 for：将数据库中blob类型对应为byte[]--> private <#if po.type=='java.sql.Blob'>byte[]<#else>${po.type} ${po.fieldName}; diff --git a/src/main/resources/jeecg/ext-template/rowedit/single/cgform_entityTemplate.ftl b/src/main/resources/jeecg/ext-template/rowedit/single/cgform_entityTemplate.ftl index 11f803c7..18e1c0cc 100644 --- a/src/main/resources/jeecg/ext-template/rowedit/single/cgform_entityTemplate.ftl +++ b/src/main/resources/jeecg/ext-template/rowedit/single/cgform_entityTemplate.ftl @@ -1,3 +1,4 @@ +<#include "../../ui/excel.ftl"/> <#if packageStyle == "service"> package ${bussiPackage}.${entityPackage}.entity; <#else> @@ -42,9 +43,9 @@ public class ${entityName}Entity implements java.io.Serializable { <#list columns as po> /**${po.content}*/ <#if po.isShow != 'N'> - <#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> - @Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"<#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"<#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}") - <#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> + <#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> + <@excel po = po/> + <#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> <#--update-start--Author:luobaoli Date:20150609 for：将数据库中blob类型对应为byte[]--> private <#if po.type=='java.sql.Blob'>byte[]<#else>${po.type} ${po.fieldName}; diff --git a/src/main/resources/jeecg/ext-template/tab/onetomany/cgform_entityTemplate.ftl b/src/main/resources/jeecg/ext-template/tab/onetomany/cgform_entityTemplate.ftl index 48cabbfe..ba2fc346 100644 --- a/src/main/resources/jeecg/ext-template/tab/onetomany/cgform_entityTemplate.ftl +++ b/src/main/resources/jeecg/ext-template/tab/onetomany/cgform_entityTemplate.ftl @@ -1,3 +1,4 @@ +<#include "../../ui/excel.ftl"/> <#if packageStyle == "service"> package ${bussiPackage}.${entityPackage}.entity; <#else> @@ -39,9 +40,9 @@ public class ${entityName}Entity implements java.io.Serializable { <#list columns as po> /**${po.content}*/ <#if po.isShow != 'N'> - <#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> - @Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"<#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"<#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}") - <#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> + <#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> + <@excel po = po/> + <#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> <#if po.type == "javax.xml.soap.Text"> private java.lang.String ${po.fieldName}; diff --git a/src/main/resources/jeecg/ext-template/table/onetomany/cgform_entityTemplate.ftl b/src/main/resources/jeecg/ext-template/table/onetomany/cgform_entityTemplate.ftl index 48cabbfe..ba2fc346 100644 --- a/src/main/resources/jeecg/ext-template/table/onetomany/cgform_entityTemplate.ftl +++ b/src/main/resources/jeecg/ext-template/table/onetomany/cgform_entityTemplate.ftl @@ -1,3 +1,4 @@ +<#include "../../ui/excel.ftl"/> <#if packageStyle == "service"> package ${bussiPackage}.${entityPackage}.entity; <#else> @@ -39,9 +40,9 @@ public class ${entityName}Entity implements java.io.Serializable { <#list columns as po> /**${po.content}*/ <#if po.isShow != 'N'> - <#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> - @Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"<#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"<#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}") - <#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> + <#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> + <@excel po = po/> + <#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> <#if po.type == "javax.xml.soap.Text"> private java.lang.String ${po.fieldName}; diff --git a/src/main/resources/jeecg/ext-template/table/single/cgform_entityTemplate.ftl b/src/main/resources/jeecg/ext-template/table/single/cgform_entityTemplate.ftl index b524c1bf..abd4d93d 100644 --- a/src/main/resources/jeecg/ext-template/table/single/cgform_entityTemplate.ftl +++ b/src/main/resources/jeecg/ext-template/table/single/cgform_entityTemplate.ftl @@ -1,3 +1,4 @@ +<#include "../../ui/excel.ftl"/> <#if packageStyle == "service"> package ${bussiPackage}.${entityPackage}.entity; <#else> @@ -40,9 +41,9 @@ public class ${entityName}Entity implements java.io.Serializable { <#list columns as po> /**${po.content}*/ <#if po.isShow != 'N'> - <#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> - @Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"<#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"<#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}") - <#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> + <#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> + <@excel po = po/> + <#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> <#--update-start--Author:luobaoli Date:20150609 for：将数据库中blob类型对应为byte[]--> private <#if po.type=='java.sql.Blob'>byte[]<#else>${po.type} ${po.fieldName}; diff --git a/src/main/resources/jeecg/ext-template/ui/excel.ftl b/src/main/resources/jeecg/ext-template/ui/excel.ftl new file mode 100644 index 00000000..4835b807 --- /dev/null +++ b/src/main/resources/jeecg/ext-template/ui/excel.ftl @@ -0,0 +1,13 @@ +<#-- 实体属性@Excel注解 --> +<#macro excel po> + @Excel(name="${po.content}",width=15<#rt/> +<#if po.type == "java.util.Date"> +,format = "yyyy-MM-dd"<#rt/> + +<#if po.dictTable?if_exists?html!="" && po.showType?if_exists?html!='popup'> +,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"<#rt/> + +<#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!=""> +,dicCode="${po.dictField}"<#rt/> +) + \ No newline at end of file diff --git a/src/main/resources/jeecg/ext-template/vuebt/single/cgform_entityTemplate.ftl b/src/main/resources/jeecg/ext-template/vuebt/single/cgform_entityTemplate.ftl index c984ea4c..7e8a4a39 100644 --- a/src/main/resources/jeecg/ext-template/vuebt/single/cgform_entityTemplate.ftl +++ b/src/main/resources/jeecg/ext-template/vuebt/single/cgform_entityTemplate.ftl @@ -1,3 +1,4 @@ +<#include "../../ui/excel.ftl"/> <#if packageStyle == "service"> package ${bussiPackage}.${entityPackage}.entity; <#else> @@ -40,9 +41,10 @@ public class ${entityName}Entity implements java.io.Serializable { <#list columns as po> /**${po.content}*/ <#if po.isShow != 'N'> - <#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> - @Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"<#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"<#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}") - <#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> + <#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> + <@excel po = po/> + <#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 --> + <#--update-start--Author:luobaoli Date:20150609 for：将数据库中blob类型对应为byte[]--> private <#if po.type=='java.sql.Blob'>byte[]<#else>${po.type} ${po.fieldName}; <#--update-end--Author:luobaoli Date:20150609 for：将数据库中blob类型对应为byte[]--> diff --git a/src/main/webapp/WEB-INF/lib/freemarker-null-2.3.19.jar b/src/main/webapp/WEB-INF/lib/freemarker-null-2.3.19.jar new file mode 100644 index 00000000..50f438df Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/freemarker-null-2.3.19.jar differ diff --git a/src/main/webapp/webpage/com/jeecg/demo/excel/jeecgDemoExcel-add.jsp b/src/main/webapp/webpage/com/jeecg/demo/excel/jeecgDemoExcel-add.jsp index 363db537..c353cb54 100644 --- a/src/main/webapp/webpage/com/jeecg/demo/excel/jeecgDemoExcel-add.jsp +++ b/src/main/webapp/webpage/com/jeecg/demo/excel/jeecgDemoExcel-add.jsp @@ -28,7 +28,7 @@ - + @@ -63,7 +63,7 @@ 性别：
- +
@@ -87,7 +87,7 @@ 关联部门：
- +
diff --git a/src/main/webapp/webpage/com/jeecg/demo/excel/jeecgDemoExcel-update.jsp b/src/main/webapp/webpage/com/jeecg/demo/excel/jeecgDemoExcel-update.jsp index 3a204371..4b986da8 100644 --- a/src/main/webapp/webpage/com/jeecg/demo/excel/jeecgDemoExcel-update.jsp +++ b/src/main/webapp/webpage/com/jeecg/demo/excel/jeecgDemoExcel-update.jsp @@ -29,7 +29,6 @@ - @@ -66,7 +65,7 @@ 性别：
- +
@@ -90,7 +89,7 @@ 关联部门：
- +
diff --git a/src/main/webapp/webpage/jeecg/cgform/config/cgFormHead.jsp b/src/main/webapp/webpage/jeecg/cgform/config/cgFormHead.jsp index 2e5b2eae..b68c65db 100644 --- a/src/main/webapp/webpage/jeecg/cgform/config/cgFormHead.jsp +++ b/src/main/webapp/webpage/jeecg/cgform/config/cgFormHead.jsp @@ -58,7 +58,7 @@ String langurl = basePath + "/plug-in/mutiLang/" + lang +".js"; - > + diff --git a/src/main/webapp/webpage/jeecg/cgform/config/cgFormHeadList.jsp b/src/main/webapp/webpage/jeecg/cgform/config/cgFormHeadList.jsp index c429f235..2c4a6575 100644 --- a/src/main/webapp/webpage/jeecg/cgform/config/cgFormHeadList.jsp +++ b/src/main/webapp/webpage/jeecg/cgform/config/cgFormHeadList.jsp @@ -55,22 +55,22 @@ - + <%-- --%> - - + + - - + + - - - + + + @@ -353,7 +353,7 @@ lock : true, title: '' + " ["+rowsData[0].content+"]", opacity : 0.3, - width:1200, + width:1250, zIndex: getzIndex(), height:500, cache:false, diff --git a/src/main/webapp/webpage/main/ace_main.jsp b/src/main/webapp/webpage/main/ace_main.jsp index c8f10a2e..250f3c04 100644 --- a/src/main/webapp/webpage/main/ace_main.jsp +++ b/src/main/webapp/webpage/main/ace_main.jsp @@ -318,7 +318,9 @@ -