目录调整+js方法获取

smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/CodeBuildHandler.java → smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/CodeBuildHandler.java

@@ -65,23 +65,9 @@ public class CodeBuildHandler extends AbstractHandler {
         ModelForm form = ModelFormCache.getInstance().get(pageId);
         if (form == null) throw new BizException("未找到指定的页面定义(" + pageId + ")！");
         String moduleName = ModelProjectCache.getInstance().getModule(form.getPrjId());
+        if (StringUtils.isEmpty(moduleName)) throw new BizException("此项目未定义Module！");
 
-        if (StringUtils.isEmpty(moduleName) || SwConsts.DEF_DB_NAME.equals(moduleName) || moduleName.equals("bpm")) {
-            moduleName = "sw-system-bpm";
-        }
-        BpmConfigBean bpmConfigBean = SpringUtil.getBean(BpmConfigBean.class);
-        Map<String, String> mapIdeaModules = IdeaUtil.getModules(bpmConfigBean.getCodeJavaPath());
-        if (mapIdeaModules == null || mapIdeaModules.isEmpty()) throw new BizException("没有定义idea项目的路径(smtweb.bpm.codeJavaPath)！");
-        codeJavaPath = mapIdeaModules.get(moduleName);
-        if (StringUtils.isEmpty(codeJavaPath)) {
-            throw new BizException("没有找到对应项目在idea中Module的路径(" + moduleName + ")！");
-        }
-        codeJavaPath += "/src/main/resources/static/event/" + moduleName + "/";
-        //加上目录
-        String cn = ModelCatalogCache.getInstance().getFullName(form.getMcId());
-        if (StringUtils.isNotEmpty(cn)) {
-            codeJavaPath += cn.replaceAll("\\.", "/");
-        }
+        codeJavaPath = ModelFormHelper.getEventPath(form);
         new File(codeJavaPath).mkdirs();
 
         SwMap model = new SwMap();
@@ -102,9 +88,9 @@ public class CodeBuildHandler extends AbstractHandler {
         ModelForm form = ModelFormCache.getInstance().get(pageId);
         if (form == null) throw new BizException("未找到指定的页面定义(" + pageId + ")！");
         String moduleName = ModelProjectCache.getInstance().getModule(form.getPrjId());
+        if (StringUtils.isEmpty(moduleName)) throw new BizException("此项目未定义Module！");
 
-        if (StringUtils.isEmpty(moduleName) || SwConsts.DEF_DB_NAME.equals(moduleName) || moduleName.equals("bpm")) {
-            moduleName = "sw-system-bpm";
+        if (moduleName.equals("bpm")) {
             packageName = "cc.smtweb.system.bpm.web";
         } else {
             packageName = "cc.smtweb.biz." + moduleName + ".web";

smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java → smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java

@@ -1,6 +1,7 @@
 package cc.smtweb.system.bpm.web.design.form;
 
 import cc.smtweb.framework.core.cache.AbstractCache;
+import cc.smtweb.framework.core.common.SwConsts;
 import cc.smtweb.framework.core.common.SwEnum;
 import cc.smtweb.framework.core.exception.BizException;
 import cc.smtweb.framework.core.exception.SwException;
@@ -13,7 +14,10 @@ import cc.smtweb.framework.core.session.UserSession;
 import cc.smtweb.framework.core.util.CommUtil;
 import cc.smtweb.framework.core.util.JsonUtil;
 import cc.smtweb.framework.core.util.MapUtil;
+import cc.smtweb.framework.core.util.SpringUtil;
+import cc.smtweb.system.bpm.spring.BpmConfigBean;
 import cc.smtweb.system.bpm.util.CodeGenerator;
+import cc.smtweb.system.bpm.util.IdeaUtil;
 import cc.smtweb.system.bpm.web.design.db.ModelCatalogCache;
 import cc.smtweb.system.bpm.web.design.db.ModelProjectCache;
 import cc.smtweb.system.bpm.web.design.form.define.*;
@@ -472,4 +476,24 @@ public class ModelFormHelper {
         ModelForm form = set.iterator().next();
         return (form != null) ? form.getEntityId() : 0L;
     }
+
+    //js文件的路径
+    public String getJsPath(ModelForm form) {
+        if (form == null) throw new BizException("页面定义对象不能为空！");
+        String moduleName = ModelProjectCache.getInstance().getModule(form.getPrjId());
+        BpmConfigBean bpmConfigBean = SpringUtil.getBean(BpmConfigBean.class);
+        Map<String, String> mapIdeaModules = IdeaUtil.getModules(bpmConfigBean.getCodeJavaPath());
+        if (mapIdeaModules == null || mapIdeaModules.isEmpty()) throw new BizException("没有定义idea项目的路径(smtweb.bpm.codeJavaPath)！");
+        String codeJavaPath = mapIdeaModules.get(moduleName);
+        if (StringUtils.isEmpty(codeJavaPath)) {
+            throw new BizException("没有找到对应项目在idea中Module的路径(" + moduleName + ")！");
+        }
+        codeJavaPath += "/src/main/resources/static/event/" + moduleName + "/";
+        //加上目录
+        String cn = ModelCatalogCache.getInstance().getFullName(form.getMcId());
+        if (StringUtils.isNotEmpty(cn)) {
+            codeJavaPath += cn.replaceAll("\\.", "/");
+        }
+        return codeJavaPath;
+    }
 }

smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormLoadHandler.java → smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormLoadHandler.java

@@ -5,7 +5,14 @@ import cc.smtweb.framework.core.exception.BizException;
 import cc.smtweb.framework.core.exception.SwException;
 import cc.smtweb.framework.core.common.SwMap;
 import cc.smtweb.framework.core.mvc.service.DefaultLoadHandler;
+import cc.smtweb.framework.core.util.FileUtil;
 import cc.smtweb.framework.core.util.JsonUtil;
+import cc.smtweb.system.bpm.web.design.db.ModelProjectCache;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * Created by Akmm at 2022/5/9 16:17
@@ -60,4 +67,36 @@ public class ModelFormLoadHandler extends DefaultLoadHandler<ModelForm> {
         if (bean == null) throw new BizException("没有找到指定控件定义！id=" + id);
         return R.success(ModelFormHelper.buildWidgetFilter(bean));
     }
+
+    //加载页面js方法
+    public R loadJsFuncs() {
+        long pageId = params.readLong("pageId");
+        ModelForm form = ModelFormCache.getInstance().get(pageId);
+        if (form == null) throw new BizException("未找到指定的页面定义(" + pageId + ")！");
+        String moduleName = ModelProjectCache.getInstance().getModule(form.getPrjId());
+        List<String> listRet = new ArrayList<>();
+        R r = R.success(listRet);
+        if (StringUtils.isEmpty(moduleName)) {
+            return r;
+        }
+        String path = ModelFormHelper.getEventPath(form) + "/" + form.getName() + ".js";
+        String js = FileUtil.readFileStr(path);
+        if (StringUtils.isEmpty(js)) {
+            return r;
+        }
+        //解析，比如以【return 】
+        int index = js.lastIndexOf("return ");
+        if (index < 0) {
+            return r;
+        }
+        index = js.indexOf("{", index);
+        js = js.substring(index + 1, js.indexOf("}", index)).trim();
+        String[] fs = js.split(",");
+        for (String s: fs) {
+            if (StringUtils.isNotBlank(s)) {
+                listRet.add(s.trim());
+            }
+        }
+        return R.success(listRet);
+    }
 }

smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormService.java → smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormService.java

@@ -92,6 +92,16 @@ public class ModelFormService extends AbstractCompService {
         }
     }
 
+    //加载页面js方法
+    public R loadJsFuncs(@SwBody SwMap params, UserSession us) {
+        try {
+            ModelFormLoadHandler handler = (ModelFormLoadHandler) getHandler(params, us, TYPE_LOAD);
+            return handler.loadJsFuncs();
+        } catch (Exception e) {
+            return R.error("操作失败！", e);
+        }
+    }
+
     //加载引擎用页面模型
     public R model(@SwBody SwMap params, UserSession us) {
         try {