diff --git a/common/js/common/common.js b/common/js/common/common.js index 2cca9eb6..48d1431d 100644 --- a/common/js/common/common.js +++ b/common/js/common/common.js @@ -829,7 +829,7 @@ export const get_format_checks_v2 = (common_config, value) => { // 根据通用配置中的格式,从类型配置映射中获取对应的格式检查项 const item = typeConfigMap.get(common_config.format); // 如果找不到对应的格式检查项,则不进行后续操作 - if (!item) return; + if (!item) return [{ is_error, error_text }]; // 初始化验证状态为不通过 let isValid = false; diff --git a/pages/form-input/components/form-input/form-input-base.vue b/pages/form-input/components/form-input/form-input-base.vue index c7517660..d4182a2e 100644 --- a/pages/form-input/components/form-input/form-input-base.vue +++ b/pages/form-input/components/form-input/form-input-base.vue @@ -557,7 +557,7 @@ export default { 'select-multi': { is_format: true, type: 'checkbox' }, 'date': { is_format: false, type: 'time' }, 'date-group': { is_format: false, type: 'time' }, - 'single-text': { is_format: false, type: '' }, + 'single-text': { is_format: true, type: '' }, 'multi-text': { is_format: false, type: '' }, 'rich-text': { is_format: false, type: '' }, 'radio-btns': { is_format: false, type: 'radio' }, @@ -582,7 +582,11 @@ export default { } // 其他字段的格式验证 else if (fieldCheckMap[item.key]) { - const { is_format, type } = fieldCheckMap[item.key]; + let field_data = fieldCheckMap[data_item.key]; + if (['single-text', 'select', 'radio-btns'].includes(data_item.key)) { + field_data = fieldCheckMap[data_item.com_data.type]; + } + const { is_format, type } = field_data; const { is_error = '0', error_text = '' } = get_format_checks(com_data, com_data.form_value, is_format, type); com_data.common_config.is_error = is_error; com_data.common_config.error_text = error_text; @@ -623,7 +627,11 @@ export default { } // 其他字段的格式验证 else if (fieldCheckMap[data_item.key]) { - const { is_format, type } = fieldCheckMap[data_item.key]; + let field_data = fieldCheckMap[data_item.key]; + if (['single-text', 'select', 'radio-btns'].includes(data_item.key)) { + field_data = fieldCheckMap[data_item.com_data.type]; + } + const { is_format, type } = field_data; const { is_error = '0', error_text = '' } = get_format_checks(data_item.com_data, data_item.com_data.form_value, is_format, type); data_item.com_data.common_config.is_error = is_error; data_item.com_data.common_config.error_text = error_text;