diff --git a/src/views/archivesConfig/commonFields/module/form.vue b/src/views/archivesConfig/commonFields/module/form.vue deleted file mode 100644 index fa2cc6c..0000000 --- a/src/views/archivesConfig/commonFields/module/form.vue +++ /dev/null @@ -1,100 +0,0 @@ - - - - - diff --git a/src/views/components/field/index.vue b/src/views/components/field/index.vue index a3a8f0f..656f34d 100644 --- a/src/views/components/field/index.vue +++ b/src/views/components/field/index.vue @@ -117,6 +117,11 @@ export default { return false } }, + [CRUD.HOOK.beforeToEdit](crud, form, btn) { + if (form.isColumnLength === null) { + form.isColumnLength = undefined + } + }, handleConfirm() { verifyMaintenance(encrypt(this.form.verifyCode)).then((res) => { if (res) { diff --git a/src/views/components/field/module/form.vue b/src/views/components/field/module/form.vue index fa2cc6c..f2d6b14 100644 --- a/src/views/components/field/module/form.vue +++ b/src/views/components/field/module/form.vue @@ -49,7 +49,7 @@ export default { mixins: [form(defaultForm)], data() { var checkMaxLength = (rule, value, callback) => { - if (!Number.isInteger(value) || value <= 0) { + if (value !== undefined && (!Number.isInteger(value) || value <= 0)) { callback(new Error('请输入正整数数字值')) } else { if (this.form.isDataType === 1 && value > 2000) { @@ -61,13 +61,22 @@ export default { } } } + var checkFieldName = (rule, value, callback) => { + const reg = /^[A-Za-z][A-Za-z_]+[a-zA-Z]*$/ + if (reg.test(value)) { + callback() + } else { + callback(new Error('字段标识只能由字母、字符“_”组成,并且必须以字母开头和结尾')) + } + } return { rules: { fieldCnName: [ { required: true, message: '请输入中文名称', trigger: 'blur' } ], fieldName: [ - { required: true, message: '请输入字段标识', trigger: 'blur' } + { required: true, message: '请选择字段标识', trigger: 'blur' }, + { validator: checkFieldName, trigger: 'blur' } ], isDataType: [ { required: true, message: '请选择数据类型', trigger: 'blur' } @@ -79,13 +88,11 @@ export default { options: [ { value: 1, - label: '字符', - maxlength: 2000 + label: '字符' }, { value: 2, - label: '数字', - maxlength: 11 + label: '数字' } ] }