From ade928170a1b61686ee7eafbf718a77d7df7ab29 Mon Sep 17 00:00:00 2001 From: "zhangdaiscott@163.com" Date: Thu, 17 May 2018 21:23:21 +0800 Subject: [PATCH] =?UTF-8?q?JEECG=203.7.5=20VUE+ElementUI=20SPA=E5=8D=95?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=BA=94=E7=94=A8=E7=89=88=E6=9C=AC=E5=8F=91?= =?UTF-8?q?=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/core/SystemController.java | 50 ++----- .../${entityNameUncapFirst}.jsp | 34 ++++- .../${entityNameUncapFirst}List.jsp | 6 +- .../impl/${entityName}ServiceImpl.java | 18 ++- .../${entityNameUncapFirst}List.jsp | 33 +++-- .../${entityNameUncapFirst}-add.jsp | 129 +++++++++-------- .../${entityNameUncapFirst}-update.jsp | 132 +++++++++--------- .../${entityNameUncapFirst}-add.jsp | 35 +---- .../${entityNameUncapFirst}-update.jsp | 93 +----------- .../${entityNameUncapFirst}List.jsp | 23 ++- .../impl/${entityName}ServiceImpl.java | 18 ++- .../jeecg/ext-common-template/ui/tag.ftl | 23 +++ .../lib/codegenerate-3.6.3-20180503.jar | Bin 112717 -> 113114 bytes 13 files changed, 281 insertions(+), 313 deletions(-) diff --git a/src/main/java/org/jeecgframework/web/system/controller/core/SystemController.java b/src/main/java/org/jeecgframework/web/system/controller/core/SystemController.java index c47a9119..b5d1133d 100644 --- a/src/main/java/org/jeecgframework/web/system/controller/core/SystemController.java +++ b/src/main/java/org/jeecgframework/web/system/controller/core/SystemController.java @@ -123,7 +123,7 @@ public class SystemController extends BaseController { public ModelAndView druid() { return new ModelAndView(new RedirectView("druid/index.html")); } - + @RequestMapping(params = "typeListJson") @ResponseBody public AjaxJson typeListJson(@RequestParam(required=true)String typeGroupName) { @@ -139,13 +139,13 @@ public class SystemController extends BaseController { for (TSType type : typeList) { JSONObject typeJson = new JSONObject(); typeJson.put("typecode", type.getTypecode()); - + //update-begin-author:taoyan 数据字典加载国际化--- String typename = type.getTypename(); if(MutiLangUtil.existLangKey(typename)){ typename = MutiLangUtil.doMutiLang(typename,""); } typeJson.put("typename",typename ); - + //update-end-author:taoyan 数据字典加载国际化--- typeArray.add(typeJson); } } @@ -157,7 +157,6 @@ public class SystemController extends BaseController { } return ajaxJson; } - /** * 类型字典列表页面跳转 @@ -201,7 +200,6 @@ public class SystemController extends BaseController { @RequestMapping(params = "typeGroupGrid") public void typeGroupGrid(HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid, TSTypegroup typegroup) { CriteriaQuery cq = new CriteriaQuery(TSTypegroup.class, dataGrid); - String typegroupname = request.getParameter("typegroupname"); if(oConvertUtils.isNotEmpty(typegroupname)) { typegroupname = typegroupname.trim(); @@ -220,10 +218,10 @@ public class SystemController extends BaseController { this.systemService.getDataGridReturn(cq, true); MutiLangUtil.setMutiLangValueForList(dataGrid.getResults(), "typegroupname"); - TagUtil.datagrid(response, dataGrid); } + /** * * @param request @@ -252,7 +250,6 @@ public class SystemController extends BaseController { return new ArrayList(){{add(rootCombotree);}}; } - /** * easyuiAJAX请求数据 * @@ -268,15 +265,11 @@ public class SystemController extends BaseController { CriteriaQuery cq = new CriteriaQuery(TSType.class, dataGrid); cq.eq("TSTypegroup.id", typegroupid); cq.like("typename", typename); - cq.addOrder("createDate", SortDirection.desc); - cq.add(); this.systemService.getDataGridReturn(cq, true); - MutiLangUtil.setMutiLangValueForList(dataGrid.getResults(), "typename"); - TagUtil.datagrid(response, dataGrid); } @@ -291,7 +284,6 @@ public class SystemController extends BaseController { request.setAttribute("typegroupid", typegroupid); return new ModelAndView("system/type/typeListForTypegroup"); } - // @RequestMapping(params = "typeGroupTree") // @ResponseBody // public List typeGroupTree(HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid) { @@ -342,16 +334,13 @@ public class SystemController extends BaseController { } } else { cq = new CriteriaQuery(TSTypegroup.class); - String typegroupcode = request.getParameter("typegroupcode"); if(typegroupcode != null ) { - HqlRuleEnum rule = PageValueConvertRuleEnum .convert(typegroupcode); Object value = PageValueConvertRuleEnum.replaceValue(rule, typegroupcode); ObjectParseUtil.addCriteria(cq, "typegroupcode", rule, value); - cq.add(); } String typegroupname = request.getParameter("typegroupname"); @@ -360,7 +349,6 @@ public class SystemController extends BaseController { List typegroupnameKeyList = systemService.findByQueryString("select typegroupname from TSTypegroup"); MutiLangSqlCriteriaUtil.assembleCondition(typegroupnameKeyList, cq, "typegroupname", typegroupname); } - List typeGroupList = systemService.getListByCriteriaQuery(cq, false); for (TSTypegroup obj : typeGroupList) { TreeGrid treeNode = new TreeGrid(); @@ -447,7 +435,6 @@ public class SystemController extends BaseController { String message = null; AjaxJson j = new AjaxJson(); typegroup = systemService.getEntity(TSTypegroup.class, typegroup.getId()); - message = "类型分组: " + mutiLangService.getLang(typegroup.getTypegroupname()) + " 被删除 成功"; if (ListUtils.isNullOrEmpty(typegroup.getTSTypes())) { systemService.delete(typegroup); @@ -457,7 +444,6 @@ public class SystemController extends BaseController { } else { message = "类型分组: " + mutiLangService.getLang(typegroup.getTypegroupname()) + " 下有类型信息，不能删除！"; } - j.setMsg(message); return j; } @@ -502,7 +488,8 @@ public class SystemController extends BaseController { } return v; } - + + /** * 刷新字典分组缓存&字典缓存 * @@ -523,7 +510,6 @@ public class SystemController extends BaseController { j.setMsg(message); return j; } - /** * 添加类型分组 @@ -705,7 +691,6 @@ public class SystemController extends BaseController { systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO); } else { - // String orgCode = systemService.generateOrgCode(depart.getId(), pid); // depart.setOrgCode(orgCode); if(oConvertUtils.isNotEmpty(pid)){ @@ -716,7 +701,6 @@ public class SystemController extends BaseController { String localMaxCode = getMaxLocalCode(null); depart.setOrgCode(YouBianCodeUtil.getNextYouBianCode(localMaxCode)); } - userService.save(depart); message = MutiLangUtil.paramAddSuccess("common.department"); systemService.addLog(message, Globals.Log_Type_INSERT, Globals.Log_Leavel_INFO); @@ -733,28 +717,22 @@ public class SystemController extends BaseController { int localCodeLength = parentCode.length() + YouBianCodeUtil.zhanweiLength; StringBuilder sb = new StringBuilder(); sb.append("SELECT org_code FROM t_s_depart"); - if(ResourceUtil.getJdbcUrl().indexOf(JdbcDao.DATABSE_TYPE_SQLSERVER)!=-1){ sb.append(" where LEN(org_code) = ").append(localCodeLength); }else{ sb.append(" where LENGTH(org_code) = ").append(localCodeLength); } - if(oConvertUtils.isNotEmpty(parentCode)){ sb.append(" and org_code like '").append(parentCode).append("%'"); } else { - sb.append(" and LEFT(org_code,1)='A'"); - } - sb.append(" ORDER BY org_code DESC"); List> objMapList = systemService.findForJdbc(sb.toString(), 1, 1); String returnCode = null; if(objMapList!=null && objMapList.size()>0){ returnCode = (String)objMapList.get(0).get("org_code"); } - return returnCode; } @@ -1130,7 +1108,7 @@ public class SystemController extends BaseController { public ModelAndView commonUpload(HttpServletRequest req) { return new ModelAndView("common/upload/uploadView"); } - + @RequestMapping(params = "commonWebUpload") public ModelAndView commonWebUpload(HttpServletRequest req) { return new ModelAndView("common/upload/uploadView2"); @@ -1223,7 +1201,7 @@ public class SystemController extends BaseController { for (String string : set) { DataLogDiff dataLogDiff = new DataLogDiff(); dataLogDiff.setName(string); - + if (map1.containsKey(string)) { if ("createDate".equals(string)&&StringUtil.isNotEmpty(map1.get(string))){ java.util.Date date=new Date((String) map1.get(string)); @@ -1232,7 +1210,6 @@ public class SystemController extends BaseController { }else { value1 = map1.get(string).toString(); } - if (value1 == null) { dataLogDiff.setValue1(""); }else { @@ -1241,7 +1218,6 @@ public class SystemController extends BaseController { }else{ dataLogDiff.setValue1(""); } - if (map2.containsKey(string)) { if ("createDate".equals(string)&&StringUtil.isNotEmpty(map2.get(string))){ java.util.Date date=new Date((String) map2.get(string)); @@ -1250,7 +1226,6 @@ public class SystemController extends BaseController { }else { value2 = map2.get(string).toString(); } - if (value2 == null) { dataLogDiff.setValue2(""); }else { @@ -1259,7 +1234,6 @@ public class SystemController extends BaseController { }else { dataLogDiff.setValue2(""); } - if (value1 == null && value2 == null) { dataLogDiff.setDiff("N"); @@ -1289,7 +1263,6 @@ public class SystemController extends BaseController { return new ModelAndView("system/dataLog/diffDataVersion"); } - /** * ftpUploader * ftp实现 文件上传处理/删除处理 @@ -1528,7 +1501,7 @@ public class SystemController extends BaseController { } return success; } - + /** * WebUploader @@ -1606,10 +1579,12 @@ public class SystemController extends BaseController { public void getImgByurl(HttpServletResponse response,HttpServletRequest request) throws Exception{ String flag=request.getParameter("down");//是否下载否则展示图片 String dbpath = request.getParameter("dbPath"); + if(oConvertUtils.isNotEmpty(dbpath)&&dbpath.endsWith(",")){ + dbpath = dbpath.substring(0, dbpath.length()-1); + } if("1".equals(flag)){ response.setContentType("application/x-msdownload;charset=utf-8"); String fileName=dbpath.substring(dbpath.lastIndexOf(File.separator)+1); - String userAgent = request.getHeader("user-agent").toLowerCase(); if (userAgent.contains("msie") || userAgent.contains("like gecko") ) { fileName = URLEncoder.encode(fileName, "UTF-8"); @@ -1617,7 +1592,6 @@ public class SystemController extends BaseController { fileName = new String(fileName.getBytes("UTF-8"), "iso-8859-1"); } response.setHeader("Content-disposition", "attachment; filename="+ fileName); - }else{ response.setContentType("image/jpeg;charset=utf-8"); } diff --git a/src/main/resources/jeecg/ext-common-template/element/onetomany/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}.jsp b/src/main/resources/jeecg/ext-common-template/element/onetomany/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}.jsp index 754a380b..bd69da67 100644 --- a/src/main/resources/jeecg/ext-common-template/element/onetomany/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}.jsp +++ b/src/main/resources/jeecg/ext-common-template/element/onetomany/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}.jsp @@ -187,7 +187,23 @@ valid=$("#form").Validform({ tiptype:function(msg,o,cssctl){ if(o.type==3){ - validationMessage(o.obj,msg); + var oopanel = $(o.obj).closest(".el-tab-pane"); + var a = 0; + if(oopanel.length>0){ + var panelID = oopanel.attr("id"); + if(!!panelID){ + var waitActive = $("#tab-"+panelID.substring(panelID.indexOf("-")+1)); + if(!waitActive.attr(".aria-selected")){ + waitActive.click(); + a = 1; + } + } + } + if(a==1){ + setTimeout(function(){validationMessage(o.obj,msg);},500); + }else{ + validationMessage(o.obj,msg); + } }else{ removeMessage(o.obj); } @@ -225,8 +241,6 @@ }, - addFormVisible: false,//新增界面是否显示 - addLoading: false, //新增界面数据 addForm: { <#list pageColumns as po> @@ -367,15 +381,23 @@ initForm: function (row) { if(!!row){ this.addForm = Object.assign({}, row); - this.formFile={ <#list pageColumns as po> <#if po.showType=='file' || po.showType == 'image'> - main_${po.fieldName}:[{ + var ${po.fieldName}=[]; + if(!!this.addForm.${po.fieldName}){ + ${po.fieldName}=[{ name:this.addForm.${po.fieldName}.substring(this.addForm.${po.fieldName}.lastIndexOf('\\')+1), url:this.addForm.${po.fieldName} - }], + }] + } + this.formFile={ + <#list pageColumns as po> + <#if po.showType=='file' || po.showType == 'image'> + ${po.fieldName}:${po.fieldName}, + + }; //加载子表列表 <#list subtables as key> diff --git a/src/main/resources/jeecg/ext-common-template/element/onetomany/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}List.jsp b/src/main/resources/jeecg/ext-common-template/element/onetomany/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}List.jsp index 90de7cbc..1d75ce94 100644 --- a/src/main/resources/jeecg/ext-common-template/element/onetomany/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}List.jsp +++ b/src/main/resources/jeecg/ext-common-template/element/onetomany/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}List.jsp @@ -108,7 +108,11 @@ <#if po.showType=='file' || po.showType == 'image'> <#else> @@ -293,7 +297,7 @@ var data = datas[i]; <#list columns as po> <#if po.showType=='checkbox'> - data.${po.fieldName}=data.${po.fieldName}.split(','); + data.${po.fieldName}=!!data.${po.fieldName}?data.${po.fieldName}.split(','):[]; } diff --git a/src/main/resources/jeecg/ext-common-template/element/single/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.java b/src/main/resources/jeecg/ext-common-template/element/single/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.java index b4ba1943..818c87e3 100644 --- a/src/main/resources/jeecg/ext-common-template/element/single/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.java +++ b/src/main/resources/jeecg/ext-common-template/element/single/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.java @@ -81,7 +81,8 @@ public class ${entityName}ServiceImpl extends CommonServiceImpl implements ${ent * @return */ private void doAddBus(${entityName}Entity t) throws Exception{ - <#list buttonSqlMap['add'] as sql> + //-----------------sql增强 start---------------------------- + <#list buttonSqlMap['add'] as sql> //sql增强第${sql_index+1}条 String sqlEnhance_${sql_index+1} ="${sql}"; <#-- update--begin--author:zhoujf date:20180413 for:TASK #2623 【bug】生成代码sql 不支持表达式--> @@ -95,14 +96,16 @@ public class ${entityName}ServiceImpl extends CommonServiceImpl implements ${ent Map data = populationMap(t); executeJavaExtend("${buttonJavaMap['add'].cgJavaType}","${buttonJavaMap['add'].cgJavaValue}",data); - } + //-----------------java增强 end----------------------------- + } /** * 更新操作增强业务 * @param t * @return */ private void doUpdateBus(${entityName}Entity t) throws Exception{ - <#list buttonSqlMap['update'] as sql> + //-----------------sql增强 start---------------------------- + <#list buttonSqlMap['update'] as sql> //sql增强第${sql_index+1}条 String sqlEnhance_${sql_index+1} ="${sql}"; <#-- update--begin--author:zhoujf date:20180413 for:TASK #2623 【bug】生成代码sql 不支持表达式--> @@ -116,14 +119,16 @@ public class ${entityName}ServiceImpl extends CommonServiceImpl implements ${ent Map data = populationMap(t); executeJavaExtend("${buttonJavaMap['update'].cgJavaType}","${buttonJavaMap['update'].cgJavaValue}",data); - } + //-----------------java增强 end----------------------------- + } /** * 删除操作增强业务 * @param id * @return */ private void doDelBus(${entityName}Entity t) throws Exception{ - <#list buttonSqlMap['delete'] as sql> + //-----------------sql增强 start---------------------------- + <#list buttonSqlMap['delete'] as sql> //sql增强第${sql_index+1}条 String sqlEnhance_${sql_index+1} ="${sql}"; <#-- update--begin--author:zhoujf date:20180413 for:TASK #2623 【bug】生成代码sql 不支持表达式--> @@ -137,7 +142,8 @@ public class ${entityName}ServiceImpl extends CommonServiceImpl implements ${ent Map data = populationMap(t); executeJavaExtend("${buttonJavaMap['delete'].cgJavaType}","${buttonJavaMap['delete'].cgJavaValue}",data); - } + //-----------------java增强 end----------------------------- + } private Map populationMap(${entityName}Entity t){ Map map = new HashMap(); diff --git a/src/main/resources/jeecg/ext-common-template/element/single/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}List.jsp b/src/main/resources/jeecg/ext-common-template/element/single/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}List.jsp index 6c0a1ece..25301e10 100644 --- a/src/main/resources/jeecg/ext-common-template/element/single/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}List.jsp +++ b/src/main/resources/jeecg/ext-common-template/element/single/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}List.jsp @@ -105,7 +105,11 @@ <#if po.showType=='file' || po.showType == 'image'> <#else> @@ -171,7 +175,7 @@ :action="url.upload" :data="{isup:'1'}" :on-success="handle${po.fieldName?cap_first}UploadFile" - :on-remove="handleRemoveFile" + :on-remove="handle${po.fieldName?cap_first}RemoveFile" :file-list="formFile.${po.fieldName}"> 点击上传 @@ -336,14 +340,15 @@ <#if po.showType=='file' || po.showType == 'image'> handle${po.fieldName?cap_first}UploadFile: function(response, file, fileList){ file.url=response.obj; + this.addForm.${po.fieldName}=response.obj; if(fileList.length>1){ this.handleRemoveFile(fileList.splice(0,1)[0],fileList); } - this.addForm.${po.fieldName}=response.obj; }, - - - handleRemoveFile: function(file, fileList){ + handle${po.fieldName?cap_first}RemoveFile: function(file, fileList){ + if(fileList.length==0){ + this.addForm.${po.fieldName}=""; + } this.$http.get(this.url.upload,{ params:{ isdel:'1', @@ -352,6 +357,8 @@ }).then((res) => { }); }, + + handleSortChange(sort){ this.sort={ sort:sort.prop, @@ -456,7 +463,7 @@ var data = datas[i]; <#list columns as po> <#if po.showType=='checkbox'> - data.${po.fieldName}=data.${po.fieldName}.split(','); + data.${po.fieldName}=!!data.${po.fieldName}?data.${po.fieldName}.split(','):[]; } @@ -488,15 +495,23 @@ handleEdit: function (index, row) { this.editFormVisible = true; this.addForm = Object.assign({}, row); - this.formFile={ <#list pageColumns as po> <#if po.showType=='file' || po.showType == 'image'> - ${po.fieldName}:[{ + var ${po.fieldName}=[]; + if(!!this.addForm.${po.fieldName}){ + ${po.fieldName}=[{ name:this.addForm.${po.fieldName}.substring(this.addForm.${po.fieldName}.lastIndexOf('\\')+1), url:this.addForm.${po.fieldName} - }], + }] + } + this.formFile={ + <#list pageColumns as po> + <#if po.showType=='file' || po.showType == 'image'> + ${po.fieldName}:${po.fieldName}, + + }; }, //显示新增界面 diff --git a/src/main/resources/jeecg/ext-common-template/naturebt/onetomany/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}-add.jsp b/src/main/resources/jeecg/ext-common-template/naturebt/onetomany/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}-add.jsp index 63086d77..4d260845 100644 --- a/src/main/resources/jeecg/ext-common-template/naturebt/onetomany/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}-add.jsp +++ b/src/main/resources/jeecg/ext-common-template/naturebt/onetomany/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}-add.jsp @@ -138,49 +138,54 @@ }, methods: { - init: function(){ - var _this = this; - jQuery.ajax({ - url: "${entityName?uncap_first}Controller.do?initFormData", - type:"GET", - dataType:"JSON", - success: function (back) { - if(back.success){ - var backtemp = back.obj; - <#list pageColumns as po> - <#if po.isShow == 'Y' && po.showType=='checkbox'> - <#-- 主表checkbox值替换 --> - backtemp.${po.fieldName} = (!!backtemp.${po.fieldName})?backtemp.${po.fieldName}.split(","):[]; - - - <#list subtables as key> - var temp${subsG['${key}'].entityName}List = backtemp.${subsG['${key}'].entityName?uncap_first}List; - <#if subsG['${key}'].cgFormHead.relationType==1> - <#-- 1对1子表值替换为单个实体 --> - _this.${subsG['${key}'].entityName?uncap_first}Data = temp${subsG['${key}'].entityName}List[0]; - <#list subColumnsMap['${key}'] as po> - <#if po.isShow == 'Y' && po.showType=='checkbox'> - <#-- 1对1子表checkbox值替换 --> - _this.${subsG['${key}'].entityName?uncap_first}Data.${po.fieldName}=(!!_this.${subsG['${key}'].entityName?uncap_first}Data.${po.fieldName})?_this.${subsG['${key}'].entityName?uncap_first}Data.${po.fieldName}.split(","):[]; - - - <#else> - <#list subColumnsMap['${key}'] as po> - <#if po.isShow == 'Y' && po.showType=='checkbox'> - <#-- 1对n子表checkbox值替换 需要循环 --> - if(!!temp${subsG['${key}'].entityName}List && temp${subsG['${key}'].entityName}List.length>0){ - for(var a = 0;a - - - - _this.formdata = backtemp; - } - } - }); + loadData:function(){ + return new Promise(function(resolve, reject){ + jQuery.ajax({ + url: "${entityName?uncap_first}Controller.do?initFormData", + type:"GET", + dataType:"JSON", + success: function (back) { + if(back.success){ + resolve(back.obj); + } + } + }); + }); + }, + init: function(backtemp){ + var _this = this; + <#list pageColumns as po> + <#if po.isShow == 'Y' && po.showType=='checkbox'> + <#-- 主表checkbox值替换 --> + backtemp.${po.fieldName} = (!!backtemp.${po.fieldName})?backtemp.${po.fieldName}.split(","):[]; + + + <#list subtables as key> + var temp${subsG['${key}'].entityName}List = backtemp.${subsG['${key}'].entityName?uncap_first}List; + <#if subsG['${key}'].cgFormHead.relationType==1> + <#-- 1对1子表值替换为单个实体 --> + _this.${subsG['${key}'].entityName?uncap_first}Data = temp${subsG['${key}'].entityName}List[0]; + <#list subColumnsMap['${key}'] as po> + <#if po.isShow == 'Y' && po.showType=='checkbox'> + <#-- 1对1子表checkbox值替换 --> + _this.${subsG['${key}'].entityName?uncap_first}Data.${po.fieldName}=(!!_this.${subsG['${key}'].entityName?uncap_first}Data.${po.fieldName})?_this.${subsG['${key}'].entityName?uncap_first}Data.${po.fieldName}.split(","):[]; + + + <#else> + <#list subColumnsMap['${key}'] as po> + <#if po.isShow == 'Y' && po.showType=='checkbox'> + <#-- 1对n子表checkbox值替换 需要循环 --> + if(!!temp${subsG['${key}'].entityName}List && temp${subsG['${key}'].entityName}List.length>0){ + for(var a = 0;a + + + + _this.formdata = backtemp; + _this.addValidType(); }, initDictsData:function(){ var _this = this; @@ -209,20 +214,20 @@ }, addValidType:function(){ - <#list pageColumns as po> - <#if po.isShow == 'Y' && po.showType !='input' && po.showType !='checkbox'> - <@datatypeJs descriptb="${ftl_description}" po = po/> - - - setTimeout(function(){ - <#list subtables as key> - <#list subColumnsMap['${key}'] as spo> - <#if spo.isShow == 'Y' && spo.showType !='input' && spo.showType !='checkbox'> - <@datatypeJs descriptb="${subsG['${key}'].ftlDescription}" po = spo/> - - - - },1000); + this.$nextTick(() => { + <#list pageColumns as po> + <#if po.isShow == 'Y' && po.showType !='input' && po.showType !='checkbox'> + <@datatypeJs descriptb="${ftl_description}" po = po/> + + + <#list subtables as key> + <#list subColumnsMap['${key}'] as spo> + <#if spo.isShow == 'Y' && spo.showType !='input' && spo.showType !='checkbox'> + <@datatypeJs descriptb="${subsG['${key}'].ftlDescription}" po = spo/> + + + + }); }, <#list subTab as sub> delete${sub.entityName}:function(index, row) { @@ -287,10 +292,12 @@ }); } }, - mounted() { - this.init(); - this.initDictsData(); - this.addValidType(); + mounted:function() { + var _this = this; + _this.loadData().then(function(data){ + _this.init(data); + }); + _this.initDictsData(); } }); $(document).ready(function() { diff --git a/src/main/resources/jeecg/ext-common-template/naturebt/onetomany/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}-update.jsp b/src/main/resources/jeecg/ext-common-template/naturebt/onetomany/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}-update.jsp index 5e801fed..a830192d 100644 --- a/src/main/resources/jeecg/ext-common-template/naturebt/onetomany/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}-update.jsp +++ b/src/main/resources/jeecg/ext-common-template/naturebt/onetomany/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}-update.jsp @@ -39,7 +39,7 @@
- +
<#list pageColumns as po> @@ -138,50 +138,54 @@ }, methods: { - init:function(){ - var _this = this; - jQuery.ajax({ - url: "${entityName?uncap_first}Controller.do?initFormData&id=${'$'}{formId}", - type:"GET", - dataType:"JSON", - success: function (back) { - if(back.success){ - var backtemp = back.obj; - <#list pageColumns as po> - <#if po.isShow == 'Y' && po.showType=='checkbox'> - <#-- 主表checkbox值替换 --> - backtemp.${po.fieldName} = (!!backtemp.${po.fieldName})?backtemp.${po.fieldName}.split(","):[]; - - - <#list subtables as key> - var temp${subsG['${key}'].entityName}List = backtemp.${subsG['${key}'].entityName?uncap_first}List; - <#if subsG['${key}'].cgFormHead.relationType==1> - <#-- 1对1子表值替换为单个实体 --> - _this.${subsG['${key}'].entityName?uncap_first}Data = temp${subsG['${key}'].entityName}List[0]; - <#list subColumnsMap['${key}'] as po> - <#if po.isShow == 'Y' && po.showType=='checkbox'> - <#-- 1对1子表checkbox值替换 --> - _this.${subsG['${key}'].entityName?uncap_first}Data.${po.fieldName}=(!!_this.${subsG['${key}'].entityName?uncap_first}Data.${po.fieldName})?_this.${subsG['${key}'].entityName?uncap_first}Data.${po.fieldName}.split(","):[]; - - - <#else> - <#list subColumnsMap['${key}'] as po> - <#if po.isShow == 'Y' && po.showType=='checkbox'> - <#-- 1对n子表checkbox值替换 需要循环 --> - if(!!temp${subsG['${key}'].entityName}List && temp${subsG['${key}'].entityName}List.length>0){ - for(var a = 0;a - - - - _this.formdata = backtemp; - } - - } - }); + loadData:function(){ + return new Promise(function(resolve, reject){ + jQuery.ajax({ + url: "${entityName?uncap_first}Controller.do?initFormData&id=${'$'}{formId}", + type:"GET", + dataType:"JSON", + success: function (back) { + if(back.success){ + resolve(back.obj); + } + } + }); + }); + }, + init:function(backtemp){ + var _this = this; + <#list pageColumns as po> + <#if po.isShow == 'Y' && po.showType=='checkbox'> + <#-- 主表checkbox值替换 --> + backtemp.${po.fieldName} = (!!backtemp.${po.fieldName})?backtemp.${po.fieldName}.split(","):[]; + + + <#list subtables as key> + var temp${subsG['${key}'].entityName}List = backtemp.${subsG['${key}'].entityName?uncap_first}List; + <#if subsG['${key}'].cgFormHead.relationType==1> + <#-- 1对1子表值替换为单个实体 --> + _this.${subsG['${key}'].entityName?uncap_first}Data = temp${subsG['${key}'].entityName}List[0]; + <#list subColumnsMap['${key}'] as po> + <#if po.isShow == 'Y' && po.showType=='checkbox'> + <#-- 1对1子表checkbox值替换 --> + _this.${subsG['${key}'].entityName?uncap_first}Data.${po.fieldName}=(!!_this.${subsG['${key}'].entityName?uncap_first}Data.${po.fieldName})?_this.${subsG['${key}'].entityName?uncap_first}Data.${po.fieldName}.split(","):[]; + + + <#else> + <#list subColumnsMap['${key}'] as po> + <#if po.isShow == 'Y' && po.showType=='checkbox'> + <#-- 1对n子表checkbox值替换 需要循环 --> + if(!!temp${subsG['${key}'].entityName}List && temp${subsG['${key}'].entityName}List.length>0){ + for(var a = 0;a + + + + _this.formdata = backtemp; + _this.addValidType(); }, initDictsData:function(){ var _this = this; @@ -210,20 +214,20 @@ }, addValidType:function(){ - <#list pageColumns as po> - <#if po.isShow == 'Y' && po.showType !='input' && po.showType !='checkbox'> - <@datatypeJs descriptb="${ftl_description}" po = po /> - - - setTimeout(function(){ - <#list subtables as key> - <#list subColumnsMap['${key}'] as spo> - <#if spo.isShow == 'Y' && spo.showType !='input' && spo.showType !='checkbox'> - <@datatypeJs descriptb="${subsG['${key}'].ftlDescription}" po = spo /> - - - - },1000); + this.$nextTick(() => { + <#list pageColumns as po> + <#if po.isShow == 'Y' && po.showType !='input' && po.showType !='checkbox'> + <@datatypeJs descriptb="${ftl_description}" po = po /> + + + <#list subtables as key> + <#list subColumnsMap['${key}'] as spo> + <#if spo.isShow == 'Y' && spo.showType !='input' && spo.showType !='checkbox'> + <@datatypeJs descriptb="${subsG['${key}'].ftlDescription}" po = spo /> + + + + }); }, <#list subTab as sub> delete${sub.entityName}:function(index, row) { @@ -288,10 +292,12 @@ }); } }, - mounted() { - this.init(); - this.initDictsData(); - this.addValidType(); + mounted:function() { + var _this = this; + _this.loadData().then(function(data){ + _this.init(data); + }); + _this.initDictsData(); } }); $(document).ready(function() { diff --git a/src/main/resources/jeecg/ext-common-template/naturebt/single/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}-add.jsp b/src/main/resources/jeecg/ext-common-template/naturebt/single/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}-add.jsp index 415f95f3..c7f04833 100644 --- a/src/main/resources/jeecg/ext-common-template/naturebt/single/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}-add.jsp +++ b/src/main/resources/jeecg/ext-common-template/naturebt/single/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}-add.jsp @@ -45,11 +45,11 @@ <#if uploadFlag==1> <#assign fileName = "" /> - - + + - + @@ -72,7 +72,7 @@ <#elseif po.showType=='file' || po.showType == 'image'> - <@uploadtag po = po/> + <@webuploadtag po = po defval=""/> <#else> /> @@ -149,11 +149,7 @@ callback : function(data) { var win = frameElement.api.opener; if (data.success == true) { - <#if uploadFlag==1> - callbackUpload(data); - <#else> frameElement.api.close(); - win.reloadTable(); win.tip(data.msg); } else { @@ -176,29 +172,6 @@ }); }); - <#if uploadFlag==1> - function callbackUpload(data) { - if(!$("input[name='id']").val()){ - if(data.obj!=null && data.obj!='undefined'){ - $("input[name='id']").val(data.obj.id); - } - } - if($(".uploadify-queue-item").length>0){ - <#assign subFileName = fileName?substring(0,fileName?length - 1) /> - <#list subFileName?split(",") as name> - $('#${name}').uploadify('upload', '*'); - - }else{ - frameElement.api.close(); - } - } - function cancel() { - <#assign subFileName2 = fileName?substring(0,fileName?length - 1) /> - <#list subFileName2?split(",") as name> - $('#${name}').uploadify('cancel', '*'); - - } - \ No newline at end of file diff --git a/src/main/resources/jeecg/ext-common-template/naturebt/single/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}-update.jsp b/src/main/resources/jeecg/ext-common-template/naturebt/single/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}-update.jsp index 3c2104ef..5fc3d2c9 100644 --- a/src/main/resources/jeecg/ext-common-template/naturebt/single/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}-update.jsp +++ b/src/main/resources/jeecg/ext-common-template/naturebt/single/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}-update.jsp @@ -45,13 +45,11 @@ <#if uploadFlag==1> <#assign fileName = "" /> - - - - + + - + @@ -81,7 +79,7 @@ <#elseif po.showType=='file' || po.showType == 'image'> - <@uploadtag po = po opt = "update"/> + <@webuploadtag po = po defval="${'$'}{${entityName?uncap_first}Page.${po.fieldName}}"/> <#else> /> @@ -160,11 +158,7 @@ callback : function(data) { var win = frameElement.api.opener; if (data.success == true) { - <#if uploadFlag==1> - callbackUpload(data); - <#else> frameElement.api.close(); - win.reloadTable(); win.tip(data.msg); } else { @@ -187,84 +181,5 @@ }); }); -<#if uploadFlag==1> - - \ No newline at end of file diff --git a/src/main/resources/jeecg/ext-common-template/naturebt/single/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}List.jsp b/src/main/resources/jeecg/ext-common-template/naturebt/single/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}List.jsp index e842f5b8..31c599a7 100644 --- a/src/main/resources/jeecg/ext-common-template/naturebt/single/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}List.jsp +++ b/src/main/resources/jeecg/ext-common-template/naturebt/single/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}List.jsp @@ -85,6 +85,21 @@ 批量删除 + + + + + +