From 3632d8876af09f3e4dab925acac409b6d7efdc49 Mon Sep 17 00:00:00 2001 From: FLYPHT <1035748121@qq.com> Date: Mon, 29 Aug 2022 18:24:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=B7=A5=E4=BD=9C=E6=B5=81?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E7=9A=84=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bpm/web/design/form/ModelFormHelper.java | 2 +- .../bpm/web/design/form/model/ModelFactory.java | 4 +- .../design/form/model/flow/FlowSingleWorker.java | 73 +++++++++++++++++++++ .../web/design/form/model/flow/LcFlowWorker.java | 75 ---------------------- .../flow/listcard/single/FlowSingleService.java | 2 + .../template/default/incModel/inc_list_query.ftl | 17 +++-- .../template/default/incModel/inc_list_table.ftl | 6 +- .../static/template/default/model_card_flow.ftl | 37 +++++++---- .../static/template/default/model_list_flow.ftl | 10 +-- .../cc/smtweb/framework/core/common/SwEnum.java | 2 +- 10 files changed, 122 insertions(+), 106 deletions(-) create mode 100644 smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/model/flow/FlowSingleWorker.java delete mode 100644 smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/model/flow/LcFlowWorker.java 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 950c892..2dfed23 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 @@ -491,7 +491,7 @@ public class ModelFormHelper { field.put("id", pdf.id); field.put("field", pdf.field); field.put("name", pdf.name); - String label = (String) field.get("field_text"); + String label = (String) field.get("field_label"); field.put("label", StringUtils.isEmpty(label)? pdf.label: label); field.put("required", pdf.isFieldNotNull()); final SwEnum.DataTypeBean dtb = SwEnum.DataType.instance.getByValue(pdf.dataType); diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/model/ModelFactory.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/model/ModelFactory.java index 328d356..bf1494d 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/model/ModelFactory.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/model/ModelFactory.java @@ -5,7 +5,7 @@ import cc.smtweb.framework.core.common.SwEnum; import cc.smtweb.framework.core.exception.SwException; import cc.smtweb.system.bpm.web.design.form.ModelForm; import cc.smtweb.system.bpm.web.design.form.ModelFormHelper; -import cc.smtweb.system.bpm.web.design.form.model.flow.LcFlowWorker; +import cc.smtweb.system.bpm.web.design.form.model.flow.FlowSingleWorker; import org.apache.commons.lang3.StringUtils; import java.util.*; @@ -26,7 +26,7 @@ public class ModelFactory { mapWorker.put(SwEnum.ModelType.LC_LT.value, new LcLtWorker()); mapWorker.put(SwEnum.ModelType.LC_MS.value, new LcMsWorker()); mapWorker.put(SwEnum.ModelType.LC_LT_MS.value, new LcLtMsWorker()); - mapWorker.put(SwEnum.ModelType.LC_FLOW.value, new LcFlowWorker()); + mapWorker.put(SwEnum.ModelType.FLOW_SINGLE.value, new FlowSingleWorker()); } public static ModelFactory getInstance() { diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/model/flow/FlowSingleWorker.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/model/flow/FlowSingleWorker.java new file mode 100644 index 0000000..990b331 --- /dev/null +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/model/flow/FlowSingleWorker.java @@ -0,0 +1,73 @@ +package cc.smtweb.system.bpm.web.design.form.model.flow; + +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.db.EntityDao; +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 cc.smtweb.system.bpm.web.design.form.model.BaseModelWorker; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Author: tanghp + * @Date: 2022-08-26 9:48 + * @Desc: 列表卡片（含工作流） + */ +public class FlowSingleWorker extends BaseModelWorker { + private final static String listTmpl = "model_list_flow"; + private final static String cardTmpl = "model_card_flow"; + @Override + protected void saveModule(ModelForm bean, List listFormChild) { + EntityDao dao = DbEngine.getInstance().findDao(ModelForm.class); + + SwMap opts = bean.getOpts(); + SwMap cfg = opts.readMap(ModelFormHelper.OPT_CONFIG); + SwMap cfgPage = new SwMap(); + cfg.put(ModelFormHelper.OPT_PAGE, cfgPage); + // 添加列表页面名称 + String listFormName = ModelFormHelper.getPageName(bean) + StringUtil.upFirst(SwEnum.PageType.LIST.value); + cfgPage.put(SwEnum.PageType.LIST.value, listFormName); + // 添加卡片页面名称 + String cardFormName = ModelFormHelper.getPageName(bean) + StringUtil.upFirst(SwEnum.PageType.CARD.value); + cfgPage.put(SwEnum.PageType.CARD.value, cardFormName); + bean.setOption(JsonUtil.encodeString(opts)); + + if (bean.isNew()) {//新增 + List insertList = new ArrayList<>(); + + ModelForm listPage = createPage(bean, SwEnum.PageType.LIST.value); + listFormChild.add(listPage); + insertList.add(listPage); + + ModelForm cardPage = createPage(bean, SwEnum.PageType.CARD.value); + listFormChild.add(cardPage); + insertList.add(cardPage); + + dao.batchInsertEntity(insertList); + } else {//修改，先不考虑修改模型的情况 todo + + } + } + + @Override + public void buildSaveModel(ModelForm bean) { + ModelForm parent = ModelFormCache.getInstance().get(bean.getParent()); + if(parent==null){ + return; + } + String listFormName = parent.getName()+ StringUtil.upFirst(SwEnum.PageType.LIST.value); + String cardFormName = parent.getName()+ StringUtil.upFirst(SwEnum.PageType.CARD.value); + if(listFormName.equals(bean.getName())){ + ModelFormHelper.buildSaveModelByTmpl(bean, listTmpl); + }else if(cardFormName.equals(bean.getName())){ + ModelFormHelper.buildSaveModelByTmpl(bean, cardTmpl); + } + } + +} diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/model/flow/LcFlowWorker.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/model/flow/LcFlowWorker.java deleted file mode 100644 index 911a2de..0000000 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/model/flow/LcFlowWorker.java +++ /dev/null @@ -1,75 +0,0 @@ -package cc.smtweb.system.bpm.web.design.form.model.flow; - -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.db.EntityDao; -import cc.smtweb.framework.core.exception.SwException; -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 cc.smtweb.system.bpm.web.design.form.model.BaseModelWorker; -import org.apache.commons.lang3.StringUtils; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: tanghp - * @Date: 2022-08-26 9:48 - * @Desc: 列表卡片（含工作流） - */ -public class LcFlowWorker extends BaseModelWorker { - private final static String listTmpl = "model_list_flow"; - private final static String cardTmpl = "model_card_flow"; - @Override - protected void saveModule(ModelForm bean, List listFormChild) { - EntityDao dao = DbEngine.getInstance().findDao(ModelForm.class); - - SwMap opts = bean.getOpts(); - SwMap cfg = opts.readMap(ModelFormHelper.OPT_CONFIG); - SwMap cfgPage = new SwMap(); - cfg.put(ModelFormHelper.OPT_PAGE, cfgPage); - // 添加列表页面名称 - String listFormName = ModelFormHelper.getPageName(bean) + StringUtil.upFirst(SwEnum.PageType.LIST.value); - cfgPage.put(SwEnum.PageType.LIST.value, listFormName); - // 添加卡片页面名称 - String cardFormName = ModelFormHelper.getPageName(bean) + StringUtil.upFirst(SwEnum.PageType.CARD.value); - cfgPage.put(SwEnum.PageType.CARD.value, cardFormName); - bean.setOption(JsonUtil.encodeString(opts)); - - if (bean.isNew()) {//新增 - List insertList = new ArrayList<>(); - - ModelForm listPage = createPage(bean, SwEnum.PageType.LIST.value); - listFormChild.add(listPage); - insertList.add(listPage); - - ModelForm cardPage = createPage(bean, SwEnum.PageType.CARD.value); - listFormChild.add(cardPage); - insertList.add(cardPage); - - dao.batchInsertEntity(insertList); - } else {//修改，先不考虑修改模型的情况 todo - - } - } - - @Override - public void buildSaveModel(ModelForm bean) { - ModelForm parent = ModelFormCache.getInstance().get(bean.getParent()); - if(parent==null){ - return; - } - String listFormName = parent.getName()+ StringUtil.upFirst(SwEnum.PageType.LIST.value); - String cardFormName = parent.getName()+ StringUtil.upFirst(SwEnum.PageType.CARD.value); - if(listFormName.equals(bean.getName())){ - ModelFormHelper.buildSaveModelByTmpl(bean, listTmpl); - }else if(cardFormName.equals(bean.getName())){ - ModelFormHelper.buildSaveModelByTmpl(bean, cardTmpl); - } - } - -} diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/single/FlowSingleService.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/single/FlowSingleService.java index c3df03c..cde6607 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/single/FlowSingleService.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/single/FlowSingleService.java @@ -1,5 +1,6 @@ package cc.smtweb.system.bpm.web.engine.model.flow.listcard.single; +import cc.smtweb.framework.core.annotation.SwService; import cc.smtweb.system.bpm.web.engine.model.listcard.single.LCSingleDelHandler; import cc.smtweb.system.bpm.web.engine.model.listcard.single.LCSingleLoadHandler; import cc.smtweb.system.bpm.web.engine.model.listcard.single.LCSingleSaveHandler; @@ -9,6 +10,7 @@ import cc.smtweb.system.bpm.web.engine.model.listcard.single.LCSingleService; * Created by Akmm at 2022-08-26 16:35 * 带工作流的简单列表+卡片 */ +@SwService public class FlowSingleService extends LCSingleService { @Override protected LCSingleSaveHandler getSaveHandler() { diff --git a/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_query.ftl b/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_query.ftl index 72fdcb2..dbee6a3 100644 --- a/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_query.ftl +++ b/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_query.ftl @@ -6,7 +6,7 @@ "colNum": 3, "name": "query", "label": "按钮区", - "size": "50", + "size": "56", "shadow": "", "alignY": "center", "paddingRight": 20, @@ -99,8 +99,17 @@ "type": "fx-form-panel", "shape": "panel", "props": { -"size": "15", -"backgroundColor": "transparent" +"size": "0" }, -"children": [] +"children": [ + { + "id": "id182e7b9a7fa", + "type": "fx-divider", + "props": { + "label": "", + "contentPosition": "center", + "direction": "horizontal" + } + } +] }, diff --git a/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_table.ftl b/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_table.ftl index f562a66..22e2f6f 100644 --- a/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_table.ftl +++ b/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_table.ftl @@ -83,13 +83,11 @@ "label": "编辑", "type": "primary", "leftIcon": "edit", - "action": "button:edit", + "action": "button:editCard", "dataset": "${group.dataset}", "text": true, "link": false, - "linkType": "curr", - "nextAction": "", - "fxLink": "" + "linkType": "curr" } }, diff --git a/smtweb-framework/bpm/src/main/resources/static/template/default/model_card_flow.ftl b/smtweb-framework/bpm/src/main/resources/static/template/default/model_card_flow.ftl index 98f4268..5c45054 100644 --- a/smtweb-framework/bpm/src/main/resources/static/template/default/model_card_flow.ftl +++ b/smtweb-framework/bpm/src/main/resources/static/template/default/model_card_flow.ftl @@ -28,7 +28,7 @@ "type": "fx-split-panel", "shape": "panel", "props": { - "size": "50", + "size": "56", "horizontal": true, "scroll": false, "name": "s11" @@ -77,8 +77,7 @@ "props": { "label": "删除", "leftIcon": "delete", - "type": "", - "action": "button:remove" + "action": "button:delCard" }, "id": "${newId()}" }, @@ -88,8 +87,8 @@ "props": { "label": "新增", "type": "primary", - "linkType": "curr", - "leftIcon": "plus" + "leftIcon": "plus", + "action": "button:addCard" } }, { @@ -99,8 +98,7 @@ "label": "返回", "type": "success", "size": "default", - "preAction": "", - "action": "button:return", + "action": "button:backList", "leftIcon": "list-top" }, "events": {} @@ -175,6 +173,13 @@ <#if field.maxlength gt 0> "maxlength": ${field.maxlength}, + <#if field.lookup??> + "lookup": { + <#list field.lookup as k, v> + "${k}": "${v}" <#if k_has_next>, + + }, + "placeholder": "请输入内容", <#if (param.col = 2)> "tips": "${field.desc}", @@ -259,7 +264,7 @@ "type": "fx-form-panel", "shape": "panel", "props": { - "size": "50", + "size": "56", "alignY": "center", "alignX": "center" }, @@ -277,7 +282,7 @@ "props": { "label": "保存并新增", "type": "primary", - "action": "button:saveAndAdd", + "action": "button:saveAddCard", "linkType": "curr" }, "id": "${newId()}" @@ -288,7 +293,7 @@ "label": "保存", "leftIcon": "save", "type": "success", - "action": "button:save" + "action": "button:saveCard" }, "id": "${newId()}" },{ @@ -341,7 +346,17 @@ } } ] - } + }, + { + "id": "${newId()}", + "type": "fx-form-panel", + "shape": "panel", + "props": { + "size": "16", + "backgroundColor": "--color-transparent" + }, + "children": [] + } ] } } diff --git a/smtweb-framework/bpm/src/main/resources/static/template/default/model_list_flow.ftl b/smtweb-framework/bpm/src/main/resources/static/template/default/model_list_flow.ftl index ba8105b..f7267e1 100644 --- a/smtweb-framework/bpm/src/main/resources/static/template/default/model_list_flow.ftl +++ b/smtweb-framework/bpm/src/main/resources/static/template/default/model_list_flow.ftl @@ -28,7 +28,7 @@ "type": "fx-form-panel", "shape": "panel", "props": { - "size": "50", + "size": "56", "label": "查询条件", "colNum": 2, "alignY": "center", @@ -42,13 +42,7 @@ "type": "fx-title", "props": { "label": "${title}", - "fontSize": 15, - "color": "#313131", - "fontWeight": "bold", - "showPrefix": true, - "prefixWidth": 5, - "prefixHeight": 15, - "prefixColor": "#1E90FF" + "showPrefix": true } }, { diff --git a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/common/SwEnum.java b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/common/SwEnum.java index 13c4ce0..efc57b7 100644 --- a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/common/SwEnum.java +++ b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/common/SwEnum.java @@ -343,7 +343,7 @@ public interface SwEnum { public static StrEnumBean LC_LT = instance.addEnum("LC_LT", "列表卡片（左树+列表）"); public static StrEnumBean LC_MS = instance.addEnum("LC_MS", "列表卡片（主子表）"); public static StrEnumBean LC_LT_MS = instance.addEnum("LC_LT_MS", "列表卡片（左树+列表+主子表）"); - public static StrEnumBean LC_FLOW = instance.addEnum("LC_FLOW", "列表卡片（含工作流）"); + public static StrEnumBean FLOW_SINGLE = instance.addEnum("FLOW_SINGLE", "列表卡片（含工作流）"); } // 权限类型