修正站点/栏目扩展模型表单无法输入问题,修正内容独立路径无法保存问题,栏目列表发布最大页数默认值修改为0

This commit is contained in:
兮玥 2023-10-08 19:39:45 +08:00
parent 17df232a49
commit e96bbae31d
9 changed files with 22 additions and 11 deletions

View File

@ -169,8 +169,13 @@ public class ContentDTO {
* 独立模板
*/
private Map<String, Object> template;
/**
/**
* 独立路径
*/
private String staticPath;
/**
* 备注
*/
private String remark;

View File

@ -185,6 +185,11 @@ public class ContentVO {
* 发布通道
*/
private String[] publishPipe;
/**
* 独立路径
*/
private String staticPath;
/**
* 发布通道配置

View File

@ -37,12 +37,12 @@ public class MaxPageOnContentPublishProperty implements IProperty {
@Override
public boolean validate(String value) {
return StringUtils.isEmpty(value) || NumberUtils.isCreatable(value.toString());
return StringUtils.isEmpty(value) || NumberUtils.isCreatable(value);
}
@Override
public Integer defaultValue() {
return 5;
return 0;
}
@Override

View File

@ -1,6 +1,7 @@
package com.chestnut.exmodel.service;
import com.chestnut.common.utils.NumberUtils;
import com.chestnut.common.utils.StringUtils;
import com.chestnut.contentcore.domain.CmsCatalog;
import com.chestnut.contentcore.domain.CmsContent;
import com.chestnut.contentcore.service.ICatalogService;
@ -71,7 +72,7 @@ public class ExModelService {
dto.setLabel(f.getName());
dto.setFieldName(CmsExtendMetaModelType.DATA_FIELD_PREFIX + f.getCode());
dto.setControlType(f.getControlType());
dto.setValue(fv);
dto.setValue(Objects.requireNonNullElse(fv, StringUtils.EMPTY));
dto.setOptions(XModelUtils.getOptions(f.getOptions()));
IMetaControlType controlType = controlTypeMap.get(IMetaControlType.BEAN_PREFIX + f.getControlType());

View File

@ -27,4 +27,4 @@
<dependencies>
</dependencies>
</dependencyManagement>
</project>
</project>

View File

@ -6,7 +6,6 @@ import com.chestnut.common.log.annotation.Log;
import com.chestnut.common.log.enums.BusinessType;
import com.chestnut.common.security.anno.Priv;
import com.chestnut.common.security.web.BaseRestController;
import com.chestnut.common.utils.IP2RegionUtils;
import com.chestnut.common.utils.StringUtils;
import com.chestnut.search.domain.SearchLog;
import com.chestnut.search.service.ISearchLogService;

View File

@ -24,4 +24,4 @@
<module>chestnut-word</module>
<module>chestnut-monitor</module>
</modules>
</project>
</project>

View File

@ -34,7 +34,7 @@ export default {
'shortcut': SysShortcut,
'server-info': ServerInfo,
'cms-site-visit-stat': CmsSiteVisitStat,
'cms-site-data-stat': CmsSiteDataStat
'cms-site-data-stat': CmsSiteDataStat,
},
data() {
return {
@ -64,4 +64,4 @@ export default {
padding: 8px;
}
}
</style>
</style>

View File

@ -421,6 +421,7 @@
<version>${chestnut.version}</version>
</dependency>
<!-- XYX模块 -->
<!-- CMS Modules Start -->
<!-- 内容核心 -->
<dependency>
@ -595,4 +596,4 @@
</pluginRepository>
</pluginRepositories>
</project>
</project>