|
@@ -98,16 +98,18 @@ public class PageDataset { |
|
|
} |
|
|
} |
|
|
if (table == null) continue; |
|
|
if (table == null) continue; |
|
|
ModelField mf = table.findField(field.field); |
|
|
ModelField mf = table.findField(field.field); |
|
|
if (mf == null) throw new BizException("未找到表字段的定义信息(" + table.getName() + "." + field.field + ")"); |
|
|
|
|
|
|
|
|
// if (mf == null) throw new BizException("未找到表字段的定义信息(" + table.getName() + "." + field.field + ")"); |
|
|
field.table_text = table.getTitle(); |
|
|
field.table_text = table.getTitle(); |
|
|
field.fieldType = mf.getFieldType(); |
|
|
|
|
|
field.notNull = mf.getNotNull(); |
|
|
|
|
|
field.link = mf.getLink(); |
|
|
|
|
|
|
|
|
|
|
|
if (StringUtils.isEmpty(field.label)) field.label = mf.getTitle(); |
|
|
|
|
|
if (StringUtils.isEmpty(field.dataType)) field.dataType = mf.getDataType(); |
|
|
|
|
|
if (StringUtils.isEmpty(field.remark)) field.remark = mf.getRemark(); |
|
|
|
|
|
if (StringUtils.isEmpty(field.editor)) field.editor = mf.getEditor(); |
|
|
|
|
|
|
|
|
if (mf != null) { |
|
|
|
|
|
field.fieldType = mf.getFieldType(); |
|
|
|
|
|
field.notNull = mf.getNotNull(); |
|
|
|
|
|
field.link = mf.getLink(); |
|
|
|
|
|
|
|
|
|
|
|
if (StringUtils.isEmpty(field.label)) field.label = mf.getTitle(); |
|
|
|
|
|
if (StringUtils.isEmpty(field.dataType)) field.dataType = mf.getDataType(); |
|
|
|
|
|
if (StringUtils.isEmpty(field.remark)) field.remark = mf.getRemark(); |
|
|
|
|
|
if (StringUtils.isEmpty(field.editor)) field.editor = mf.getEditor(); |
|
|
|
|
|
} |
|
|
//过滤条件,需要建立依赖关系 |
|
|
//过滤条件,需要建立依赖关系 |
|
|
if (isFilter) { |
|
|
if (isFilter) { |
|
|
PageDatasetFilter filter = (PageDatasetFilter) field; |
|
|
PageDatasetFilter filter = (PageDatasetFilter) field; |
|
|