From d2fcac68456f8c03699f4523ca4e2faac1f9e3d5 Mon Sep 17 00:00:00 2001 From: zhenggm Date: Mon, 15 Aug 2022 20:27:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=EF=BC=9ALC=5FSINGLE=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E6=A0=B9=E6=8D=AE=E6=A8=A1=E6=9D=BF=E7=94=9F=E6=88=90?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java | 5 ++++- .../system/bpm/web/design/form/model/BaseModelWorker.java | 11 ++++++++++- .../system/bpm/web/design/form/model/LcSinlgeWorker.java | 6 ++++++ 3 files changed, 20 insertions(+), 2 deletions(-) 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 6884c9d..2201089 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 @@ -275,7 +275,7 @@ public class ModelFormHelper { PageDatasets datasets = form.getDatasets(); if (datasets == null || datasets.list == null) return ""; String service = form.getService(); - if (StringUtils.isEmpty(service) && form.getParent() > 0) { + if (StringUtils.isEmpty(service) && form.getParent() > 0L) { service = ModelFormCache.getInstance().get(form.getParent()).getService(); } SwMap ret = new SwMap(); @@ -388,6 +388,9 @@ public class ModelFormHelper { if (StringUtils.isNotEmpty(eventPath)) { opts.put(KEY_EVENT_PATH, eventPath + "." + bean.getName()); } + SwMap formOpts = bean.getOpts(); + opts.put(OPT_CONFIG, formOpts.get(OPT_CONFIG)); + opts.put(OPT_PAGE_TYPE, formOpts.readString(OPT_PAGE_TYPE)); } public static String getCodePath(ModelForm bean) { diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/model/BaseModelWorker.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/model/BaseModelWorker.java index 91185fa..30761e3 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/model/BaseModelWorker.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/model/BaseModelWorker.java @@ -3,12 +3,14 @@ package cc.smtweb.system.bpm.web.design.form.model; import cc.smtweb.framework.core.common.SwEnum; import cc.smtweb.framework.core.common.SwMap; import cc.smtweb.framework.core.db.DbEngine; +import cc.smtweb.framework.core.exception.SwException; import cc.smtweb.framework.core.util.CommUtil; import cc.smtweb.framework.core.util.JsonUtil; import cc.smtweb.framework.core.util.StringUtil; import cc.smtweb.system.bpm.web.design.form.ModelForm; import cc.smtweb.system.bpm.web.design.form.ModelFormCache; import cc.smtweb.system.bpm.web.design.form.ModelFormHelper; +import org.apache.commons.lang3.StringUtils; import java.util.List; import java.util.Set; @@ -41,7 +43,7 @@ public class BaseModelWorker { } - //保存页面 + //保存页面,备用 protected void savePage(ModelForm bean) { } @@ -73,6 +75,13 @@ public class BaseModelWorker { * @param bean */ public void buildSaveModel(ModelForm bean) { + String tmplId = getTmplId(bean); + if (StringUtils.isEmpty(tmplId)) throw new SwException("此类型页面没有找到对应的模板文件!"); + ModelFormHelper.buildSaveModelByTmpl(bean, tmplId); + } + //获取模板名 + protected String getTmplId(ModelForm bean) { + return null; } } diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/model/LcSinlgeWorker.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/model/LcSinlgeWorker.java index af1c310..41a1dff 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/model/LcSinlgeWorker.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/model/LcSinlgeWorker.java @@ -18,6 +18,7 @@ import java.util.Set; * Created by Akmm at 2022-08-14 12:17 */ public class LcSinlgeWorker extends BaseModelWorker { + private final static String tmpl = "model_list_card"; @Override protected void saveModule(ModelForm bean, List listFormChild) { @@ -50,4 +51,9 @@ public class LcSinlgeWorker extends BaseModelWorker { } } } + + @Override + protected String getTmplId(ModelForm bean) { + return tmpl; + } }