From 25f174924c049ae4cde39ff0574913097858c5c4 Mon Sep 17 00:00:00 2001 From: zhenggm Date: Wed, 6 Jul 2022 18:07:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cc/smtweb/system/bpm/web/design/form/ModelFormService.java | 6 ++++-- .../cc/smtweb/system/bpm/web/engine/dynPage/DynPageLoadHandler.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormService.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormService.java index 1dae930..1bc25e0 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormService.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormService.java @@ -147,16 +147,18 @@ public class ModelFormService extends AbstractCompService { SwMap col = new SwMap(2); final String colName = metaData.getColumnLabel(i).toLowerCase(); col.put("name", colName); - SwEnum.DataTypeBean dtb = SwEnum.DataType.getBySqlType(metaData.getColumnType(i), metaData.getPrecision(i), metaData.getScale(i)); - col.put("dataType", dtb.value); ModelField field = table.findField(colName); if (field != null) { + col.put("dataType", field.getDataType()); col.put("null", field.getNotNull()); col.put("default", field.getDefaultValue()); col.put("title", field.getTitle()); col.put("link", field.getLink()); col.put("table", table.getId()); col.put("table_text", table.getTitle()); + } else { + SwEnum.DataTypeBean dtb = SwEnum.DataType.getBySqlType(metaData.getColumnType(i), metaData.getPrecision(i), metaData.getScale(i)); + col.put("dataType", dtb.value); } fields.add(col); } diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageLoadHandler.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageLoadHandler.java index cf150ec..1ab87aa 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageLoadHandler.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageLoadHandler.java @@ -92,7 +92,7 @@ public class DynPageLoadHandler extends AbstractDynPageHandler { if (SwEnum.DatasetType.LIST.value.equals(pageDataSet.type)) {//列表类 bean = DynRetBean.createList(getListWorker(filter, pageDataSet).buildListData()); } else if (SwEnum.DatasetType.TREE.value.equals(pageDataSet.type)) {//树类 -// return DynRetBean.createList(SwListData.create(getTreeWorker(filter, pageDataSet).buildData())); + bean = DynRetBean.createList(SwListData.create(getTreeWorker(filter, pageDataSet).buildData(), 0)); } else {//列表类 bean = DynRetBean.createBean(provider.loadData(filter, pageDataSet)); }