mirror of
https://gitee.com/liweiyi/ChestnutCMS.git
synced 2025-12-06 16:38:24 +08:00
修正站点/栏目扩展模型表单无法输入问题,修正内容独立路径无法保存问题,栏目列表发布最大页数默认值修改为0
This commit is contained in:
parent
17df232a49
commit
e96bbae31d
@ -169,8 +169,13 @@ public class ContentDTO {
|
|||||||
* 独立模板
|
* 独立模板
|
||||||
*/
|
*/
|
||||||
private Map<String, Object> template;
|
private Map<String, Object> template;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* 独立路径
|
||||||
|
*/
|
||||||
|
private String staticPath;
|
||||||
|
|
||||||
|
/**
|
||||||
* 备注
|
* 备注
|
||||||
*/
|
*/
|
||||||
private String remark;
|
private String remark;
|
||||||
|
|||||||
@ -185,6 +185,11 @@ public class ContentVO {
|
|||||||
* 发布通道
|
* 发布通道
|
||||||
*/
|
*/
|
||||||
private String[] publishPipe;
|
private String[] publishPipe;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 独立路径
|
||||||
|
*/
|
||||||
|
private String staticPath;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 发布通道配置
|
* 发布通道配置
|
||||||
|
|||||||
@ -37,12 +37,12 @@ public class MaxPageOnContentPublishProperty implements IProperty {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean validate(String value) {
|
public boolean validate(String value) {
|
||||||
return StringUtils.isEmpty(value) || NumberUtils.isCreatable(value.toString());
|
return StringUtils.isEmpty(value) || NumberUtils.isCreatable(value);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Integer defaultValue() {
|
public Integer defaultValue() {
|
||||||
return 5;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
package com.chestnut.exmodel.service;
|
package com.chestnut.exmodel.service;
|
||||||
|
|
||||||
import com.chestnut.common.utils.NumberUtils;
|
import com.chestnut.common.utils.NumberUtils;
|
||||||
|
import com.chestnut.common.utils.StringUtils;
|
||||||
import com.chestnut.contentcore.domain.CmsCatalog;
|
import com.chestnut.contentcore.domain.CmsCatalog;
|
||||||
import com.chestnut.contentcore.domain.CmsContent;
|
import com.chestnut.contentcore.domain.CmsContent;
|
||||||
import com.chestnut.contentcore.service.ICatalogService;
|
import com.chestnut.contentcore.service.ICatalogService;
|
||||||
@ -71,7 +72,7 @@ public class ExModelService {
|
|||||||
dto.setLabel(f.getName());
|
dto.setLabel(f.getName());
|
||||||
dto.setFieldName(CmsExtendMetaModelType.DATA_FIELD_PREFIX + f.getCode());
|
dto.setFieldName(CmsExtendMetaModelType.DATA_FIELD_PREFIX + f.getCode());
|
||||||
dto.setControlType(f.getControlType());
|
dto.setControlType(f.getControlType());
|
||||||
dto.setValue(fv);
|
dto.setValue(Objects.requireNonNullElse(fv, StringUtils.EMPTY));
|
||||||
dto.setOptions(XModelUtils.getOptions(f.getOptions()));
|
dto.setOptions(XModelUtils.getOptions(f.getOptions()));
|
||||||
|
|
||||||
IMetaControlType controlType = controlTypeMap.get(IMetaControlType.BEAN_PREFIX + f.getControlType());
|
IMetaControlType controlType = controlTypeMap.get(IMetaControlType.BEAN_PREFIX + f.getControlType());
|
||||||
|
|||||||
@ -27,4 +27,4 @@
|
|||||||
<dependencies>
|
<dependencies>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</dependencyManagement>
|
</dependencyManagement>
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@ -6,7 +6,6 @@ import com.chestnut.common.log.annotation.Log;
|
|||||||
import com.chestnut.common.log.enums.BusinessType;
|
import com.chestnut.common.log.enums.BusinessType;
|
||||||
import com.chestnut.common.security.anno.Priv;
|
import com.chestnut.common.security.anno.Priv;
|
||||||
import com.chestnut.common.security.web.BaseRestController;
|
import com.chestnut.common.security.web.BaseRestController;
|
||||||
import com.chestnut.common.utils.IP2RegionUtils;
|
|
||||||
import com.chestnut.common.utils.StringUtils;
|
import com.chestnut.common.utils.StringUtils;
|
||||||
import com.chestnut.search.domain.SearchLog;
|
import com.chestnut.search.domain.SearchLog;
|
||||||
import com.chestnut.search.service.ISearchLogService;
|
import com.chestnut.search.service.ISearchLogService;
|
||||||
|
|||||||
@ -24,4 +24,4 @@
|
|||||||
<module>chestnut-word</module>
|
<module>chestnut-word</module>
|
||||||
<module>chestnut-monitor</module>
|
<module>chestnut-monitor</module>
|
||||||
</modules>
|
</modules>
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@ -34,7 +34,7 @@ export default {
|
|||||||
'shortcut': SysShortcut,
|
'shortcut': SysShortcut,
|
||||||
'server-info': ServerInfo,
|
'server-info': ServerInfo,
|
||||||
'cms-site-visit-stat': CmsSiteVisitStat,
|
'cms-site-visit-stat': CmsSiteVisitStat,
|
||||||
'cms-site-data-stat': CmsSiteDataStat
|
'cms-site-data-stat': CmsSiteDataStat,
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
@ -64,4 +64,4 @@ export default {
|
|||||||
padding: 8px;
|
padding: 8px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
3
pom.xml
3
pom.xml
@ -421,6 +421,7 @@
|
|||||||
<version>${chestnut.version}</version>
|
<version>${chestnut.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<!-- XYX模块 -->
|
||||||
<!-- CMS Modules Start -->
|
<!-- CMS Modules Start -->
|
||||||
<!-- 内容核心 -->
|
<!-- 内容核心 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
@ -595,4 +596,4 @@
|
|||||||
</pluginRepository>
|
</pluginRepository>
|
||||||
</pluginRepositories>
|
</pluginRepositories>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user