From 3599c3d4d386c6509bff227b70a37a2c25ab8964 Mon Sep 17 00:00:00 2001 From: yaoq Date: Thu, 28 Jul 2022 11:04:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bpm/web/design/form/ModelFormHelper.java | 12 +++++--- .../static/event/bpm/sys/base/dict/dict.js | 36 ---------------------- .../static/event/bpm/sys/base/dict/dictList.js | 36 ++++++++++++++++++++++ 3 files changed, 44 insertions(+), 40 deletions(-) delete mode 100644 smtweb-framework/bpm/src/main/resources/static/event/bpm/sys/base/dict/dict.js create mode 100644 smtweb-framework/bpm/src/main/resources/static/event/bpm/sys/base/dict/dictList.js 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 efeed23..33a9a7e 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 @@ -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 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 + ")！"); diff --git a/smtweb-framework/bpm/src/main/resources/static/event/bpm/sys/base/dict/dict.js b/smtweb-framework/bpm/src/main/resources/static/event/bpm/sys/base/dict/dict.js deleted file mode 100644 index fa3c318..0000000 --- a/smtweb-framework/bpm/src/main/resources/static/event/bpm/sys/base/dict/dict.js +++ /dev/null @@ -1,36 +0,0 @@ -/** - * Created by 1 at 2022-07-26 11:11:24 - * 注册事件类【数据字典管理】，参看event.defaultEvent.js -*/ -window.$swEvent.setup("bpm.sys.base.dict.dict", { - setup(page){ - const { $params,$refs, $widgets, $model, $utils, $tabRouter, $api,$lifecycle } = page || {}; - const { $$message, $$http } = $utils || {}; - // 数据字典类型表格行点击事件 - const dictTypeRowClick = (row) => { - // 缓存变量 - $model.temp?.setFormVal("dict_type_id",row.sdct_id); - // 调用字典加载 - $api.loadOne("dictList"); - }; - // 数据字典新增初始化 - const afterAddDict = () => { - // 设置字典类型 - $model.dictEdit?.setFormVal("sdc_type", $model.temp?.getFormVal("dict_type_id")); - }; - // 删除类型之后 - const afterDelDictType = () => { - $api.loadOne("dictTypeList"); - }; - // 删除字典之后 - const afterDelDict = () => { - $api.loadOne("dictList"); - }; - return { - dictTypeRowClick, - afterAddDict, - afterDelDictType, - afterDelDict, - } - } -}); diff --git a/smtweb-framework/bpm/src/main/resources/static/event/bpm/sys/base/dict/dictList.js b/smtweb-framework/bpm/src/main/resources/static/event/bpm/sys/base/dict/dictList.js new file mode 100644 index 0000000..52f58e5 --- /dev/null +++ b/smtweb-framework/bpm/src/main/resources/static/event/bpm/sys/base/dict/dictList.js @@ -0,0 +1,36 @@ +/** + * Created by 1 at 2022-07-26 11:11:24 + * 注册事件类【数据字典管理】，参看event.defaultEvent.js +*/ +window.$swEvent.setup("bpm.sys.base.dict.dictList", { + setup(page){ + const { $params,$refs, $widgets, $model, $utils, $tabRouter, $api,$lifecycle } = page || {}; + const { $$message, $$http } = $utils || {}; + // 数据字典类型表格行点击事件 + const dictTypeRowClick = (row) => { + // 缓存变量 + $model.temp?.setFormVal("dict_type_id",row.sdct_id); + // 调用字典加载 + $api.loadOne("dictList"); + }; + // 数据字典新增初始化 + const afterAddDict = () => { + // 设置字典类型 + $model.dictEdit?.setFormVal("sdc_type", $model.temp?.getFormVal("dict_type_id")); + }; + // 删除类型之后 + const afterDelDictType = () => { + $api.loadOne("dictTypeList"); + }; + // 删除字典之后 + const afterDelDict = () => { + $api.loadOne("dictList"); + }; + return { + dictTypeRowClick, + afterAddDict, + afterDelDictType, + afterDelDict, + } + } +});