From ecd57e5aa377e085abc70d62cf55ead26da35c34 Mon Sep 17 00:00:00 2001 From: FLYPHT <1035748121@qq.com> Date: Sun, 24 Jul 2022 18:19:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9A=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E5=AD=97=E6=AE=B5=20=E6=94=AF=E6=8C=81=E5=8F=96?= =?UTF-8?q?=E5=80=BC=E7=B1=BB=E5=9E=8B=E7=AD=89=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../smtweb/system/bpm/web/design/form/ModelFormHelper.java | 10 ++++++---- .../system/bpm/web/design/form/define/BaseDatasetField.java | 12 +++++++++++- .../system/bpm/web/design/form/define/PageDatasetFilter.java | 7 ------- .../main/java/cc/smtweb/framework/core/common/SwEnum.java | 1 + 4 files changed, 18 insertions(+), 12 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 a6625d4..1168e0d 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 @@ -226,12 +226,14 @@ public class ModelFormHelper { field.put("maxlength", dtb.dataLength); } } + field.put("type", pdf.type); + field.put("linkDb", pdf.linkDb); + field.put("linkField", pdf.linkField); + field.put("value", pdf.value); + field.put("expr", pdf.expr); + field.put("defValue", pdf.defValue); if (!isField) { PageDatasetFilter filter = (PageDatasetFilter) pdf; - field.put("type", filter.type); - field.put("linkDb", filter.linkDb); - field.put("linkField", filter.linkField); - field.put("value", filter.value); field.put("trigger", filter.trigger); } } diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/BaseDatasetField.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/BaseDatasetField.java index b923a0c..6f8d136 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/BaseDatasetField.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/BaseDatasetField.java @@ -31,7 +31,17 @@ public class BaseDatasetField { public long link; //控件类型：TEXT/TextArea/NUMBER/COMBO public String editor; - + //param-参数/link/const/depend + public String type; + //type为link时，关联的数据集及字段 + public String linkDb; + public String linkField; + //type为const时，常量值 + public String value; + // 默认值 + public String defValue; + // type为depend时, 表达式 + public String expr; @JsonIgnore public boolean isFieldNotNull() { return notNull == 1; diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetFilter.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetFilter.java index 22791dc..f84b728 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetFilter.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetFilter.java @@ -4,16 +4,9 @@ package cc.smtweb.system.bpm.web.design.form.define; * Created by Akmm at 2022/4/20 18:15 */ //过滤条件信息 public class PageDatasetFilter extends BaseDatasetField { - //param-参数/link/const - public String type; public String title; //sql中的查询字段名，可能带前缀 public String sqlName; - //type为link时，关联的数据集及字段 - public String linkDb; - public String linkField; - //type为const时，常量值 - public String value; // 触发类型 click按钮触发；change监听触发 public String trigger; public boolean required = false; 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 459ba85..23ed306 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 @@ -262,6 +262,7 @@ public interface SwEnum { public static StrEnumBean PARAM = instance.addEnum("param", "参数"); public static StrEnumBean LINK = instance.addEnum("link", "关联"); public static StrEnumBean CONST = instance.addEnum("const", "常量"); + public static StrEnumBean DEPEND = instance.addEnum("depend", "依赖"); } /**