认证-参数模板-导入控件备选值校验bug61759
This commit is contained in:
+11
@@ -1348,7 +1348,18 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
|
|||||||
|| ControlTypeEnum.TEXT_PULL_MORE.getValue().equals(controlType)
|
|| ControlTypeEnum.TEXT_PULL_MORE.getValue().equals(controlType)
|
||||||
|| ControlTypeEnum.TEXT_PULL_SINGLE.getValue().equals(controlType)
|
|| ControlTypeEnum.TEXT_PULL_SINGLE.getValue().equals(controlType)
|
||||||
|| ControlTypeEnum.TEXT_PULL_SINGLE_FILE.getValue().equals(controlType)) {
|
|| ControlTypeEnum.TEXT_PULL_SINGLE_FILE.getValue().equals(controlType)) {
|
||||||
|
String controlValuesRegex = "^[^##!!]*$";
|
||||||
|
if (StringUtils.isNotEmpty(controlValues) && !controlValues.matches(controlValuesRegex)) {
|
||||||
|
if(CutEnum.CN.getValue().equals(cut)) {
|
||||||
|
errorMsg += "控件备选值格式错误,不能包含中英文感叹号和井号;";
|
||||||
|
} else {
|
||||||
|
errorMsg += "Component Value formatting errors, can not chinese and English exclamation points and pound signs; ";
|
||||||
|
}
|
||||||
|
countError++;
|
||||||
|
}
|
||||||
|
|
||||||
resultMap = validateMustAndLength(controlValues, "控件备选值", "Component Value", IsMustEnum.YES.getValue(), "500", false, cut);
|
resultMap = validateMustAndLength(controlValues, "控件备选值", "Component Value", IsMustEnum.YES.getValue(), "500", false, cut);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
resultMap = validateMustAndLength(controlValues, "控件备选值", "Component Value", IsMustEnum.NO.getValue(), "500", false, cut);
|
resultMap = validateMustAndLength(controlValues, "控件备选值", "Component Value", IsMustEnum.NO.getValue(), "500", false, cut);
|
||||||
dto.setControlValues(null);
|
dto.setControlValues(null);
|
||||||
|
|||||||
Reference in New Issue
Block a user