diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/CodeBuildHandler.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/CodeBuildHandler.java index 2b443a0..51edea8 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/CodeBuildHandler.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/CodeBuildHandler.java @@ -67,7 +67,7 @@ public class CodeBuildHandler extends AbstractHandler { if (StringUtils.isEmpty(moduleName)) throw new BizException("此项目未定义Module!"); final String eventPath = ModelFormHelper.getEventPath(form); - codePath = ModelFormHelper.getCodePath(form) + "/src/main/resources/static/" + moduleName + "/" + eventPath.replaceAll("\\.", "/"); + codePath = ModelFormHelper.getCodePath(form) + "/src/main/resources/static/" + eventPath.replaceAll("\\.", "/"); new File(codePath).mkdirs(); SwMap model = new SwMap(); diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java index 19e4e10..d92acb6 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java @@ -383,10 +383,10 @@ public class ModelFormHelper { public static String getEventPath(ModelForm bean) { String moduleName = ModelProjectCache.getInstance().getModule(bean.getPrjId()); if (StringUtils.isNotEmpty(moduleName)) { -// String ep = moduleName; - return ModelCatalogCache.getInstance().getFullName(bean.getMcId()); -// if (StringUtils.isNotEmpty(cn)) ep = ep + "." + cn; -// return ep; + String ep = moduleName; + String cn = ModelCatalogCache.getInstance().getFullName(bean.getMcId()); + if (StringUtils.isNotEmpty(cn)) ep = ep + "." + cn; + return ep; } return ""; } diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormLoadHandler.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormLoadHandler.java index fd6da5c..75dc46c 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormLoadHandler.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormLoadHandler.java @@ -85,8 +85,7 @@ public class ModelFormLoadHandler extends DefaultLoadHandler { if (StringUtils.isEmpty(codeJavaPath)) { return r; } - String moduleName = ModelProjectCache.getInstance().getModule(form.getPrjId()); - String path = ModelFormHelper.getCodePath(form) + "/src/main/resources/static/" + moduleName + "/" + ModelFormHelper.getEventPath(form).replaceAll("\\.", "/") + "/" + form.getName() + ".js"; + String path = ModelFormHelper.getCodePath(form) + "/src/main/resources/static/" + ModelFormHelper.getEventPath(form).replaceAll("\\.", "/") + "/" + form.getName() + ".js"; String js = FileUtil.readFileStr(path); if (StringUtils.isEmpty(js)) { return r;