Merge remote-tracking branch 'origin/master'

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

@@ -2,11 +2,11 @@ package cc.smtweb.system.bpm.web.design.form;
 
 import cc.smtweb.framework.core.cache.AbstractCache;
 import cc.smtweb.framework.core.common.SwEnum;
-import cc.smtweb.framework.core.exception.BizException;
 import cc.smtweb.framework.core.common.SwMap;
 import cc.smtweb.framework.core.db.cache.ModelTableCache;
 import cc.smtweb.framework.core.db.vo.ModelField;
 import cc.smtweb.framework.core.db.vo.ModelTable;
+import cc.smtweb.framework.core.exception.BizException;
 import cc.smtweb.framework.core.mvc.variable.SwVariableFactory;
 import cc.smtweb.framework.core.session.UserSession;
 import cc.smtweb.framework.core.util.CommUtil;
@@ -252,13 +252,16 @@ public class ModelFormHelper {
     public static String buildEngineModel(ModelForm form, SwMap params, UserSession us, boolean incExtra) {
         PageDatasets datasets = form.getDatasets();
         if (datasets == null || datasets.list == null) return "";
-
+        String service = form.getService();
+        if (StringUtils.isEmpty(service) && form.getParent() > 0) {
+            service = ModelFormCache.getInstance().get(form.getParent()).getService();
+        }
         SwMap ret = new SwMap();
         PageModel pageInfo = parsePageInfo(form.getContent());
         if (pageInfo == null) return "";
         ret.put("pageId", form.getEntityId());
         ret.put("label", form.getTitle());
-        ret.put("service", form.getService());
+        ret.put("service", service);
         ret.put("module", ModelProjectCache.getInstance().getModule(form.getPrjId()));
         buildOptsEx(form, ret);
         //form不用管
@@ -374,7 +377,8 @@ public class ModelFormHelper {
 
         BpmConfigBean bpmConfigBean = SpringUtil.getBean(BpmConfigBean.class);
         Map<String, String> mapIdeaModules = IdeaUtil.getModules(bpmConfigBean.getCodeJavaPath(), bpmConfigBean.getMode());
-        if (mapIdeaModules == null || mapIdeaModules.isEmpty()) throw new BizException("没有定义idea项目的路径(smtweb.bpm.codeJavaPath)！");
+        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 + ")！");

smtweb-framework/bpm/src/main/resources/static/event/bpm/sys/base/dict/dict.js → smtweb-framework/bpm/src/main/resources/static/event/bpm/sys/base/dict/dictList.js

@@ -2,7 +2,7 @@
  * Created by 1 at 2022-07-26 11:11:24
  * 注册事件类【数据字典管理】，参看event.defaultEvent.js
 */
-window.$swEvent.setup("bpm.sys.base.dict.dict", {
+window.$swEvent.setup("bpm.sys.base.dict.dictList", {
   setup(page){
     const { $params,$refs, $widgets, $model, $utils, $tabRouter, $api,$lifecycle } = page || {};
     const { $$message, $$http } = $utils || {};