diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/common/SwEnum.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/common/SwEnum.java index 2a6c9a4..dec095f 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/common/SwEnum.java +++ b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/common/SwEnum.java @@ -68,15 +68,14 @@ public interface SwEnum { class EditorType extends StrEnum { public static EditorType instance = new EditorType(); - public static StrEnumBean INPUT = instance.addEnum("input", "文本"); - public static StrEnumBean TEXT = instance.addEnum("text", "长文本"); - public static StrEnumBean NUMBER = instance.addEnum("num", "数字"); + public static StrEnumBean INPUT = instance.addEnum("text", "文本"); + public static StrEnumBean TEXT = instance.addEnum("textarea", "长文本"); + public static StrEnumBean NUMBER = instance.addEnum("number", "数字"); public static StrEnumBean DATE = instance.addEnum("date", "日期"); public static StrEnumBean TIME = instance.addEnum("time", "时间"); public static StrEnumBean DATETIME = instance.addEnum("datetime", "日期时间"); - public static StrEnumBean COMBO = instance.addEnum("combo", "下拉"); - public static StrEnumBean TREE = instance.addEnum("tree", "树型"); - + public static StrEnumBean COMBO = instance.addEnum("select", "下拉列表"); + public static StrEnumBean TREE = instance.addEnum("select-tree", "下拉树"); } /** diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java index f962ce4..54b0ed7 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java @@ -428,8 +428,9 @@ public class ModelFormHelper { field.put("label", pdf.label); field.put("required", pdf.isFieldNotNull()); final SwEnum.DataTypeBean dtb = SwEnum.DataType.instance.getByValue(pdf.dataType); - if (dtb != null && dtb.dataLength > 0) { - field.put("maxlength", dtb.dataLength); + if (dtb != null) { + if (dtb.dataLength > 0) field.put("maxlength", dtb.dataLength); + field.put("editor", dtb.editor); } } } diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetField.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetField.java index 6faa2f3..b4276e6 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetField.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetField.java @@ -33,6 +33,7 @@ public class PageDatasetField { public long link; //控件类型:TEXT/TextArea/NUMBER/COMBO public String editor; + public String editModel; @JsonIgnore public boolean isFieldNotNull() { diff --git a/smtweb-system/sw-system-bpm/src/main/resources/static/template/incModel/inc_form.ftl b/smtweb-system/sw-system-bpm/src/main/resources/static/template/incModel/inc_form.ftl index 3700b0d..811170b 100644 --- a/smtweb-system/sw-system-bpm/src/main/resources/static/template/incModel/inc_form.ftl +++ b/smtweb-system/sw-system-bpm/src/main/resources/static/template/incModel/inc_form.ftl @@ -13,7 +13,7 @@ <#list fields as field> { "id": "id${newId()}", - "type": "${ctrl}", + "type": "${field.editor}", "props": { "label": "${field.label}", "type": "text", diff --git a/smtweb-system/sw-system-bpm/src/main/resources/static/template/index.yaml b/smtweb-system/sw-system-bpm/src/main/resources/static/template/index.yaml index 1b79b63..f0842e6 100644 --- a/smtweb-system/sw-system-bpm/src/main/resources/static/template/index.yaml +++ b/smtweb-system/sw-system-bpm/src/main/resources/static/template/index.yaml @@ -13,4 +13,4 @@ model: param: - name: 'p1' - type: 'ds/...' + type: 'ds'