diff --git a/src/composables/useCrud.js b/src/composables/useCrud.js index 656c4f5..ea892e7 100644 --- a/src/composables/useCrud.js +++ b/src/composables/useCrud.js @@ -57,7 +57,7 @@ export const useCrud = ({ name, initForm = {}, doCreate, doDelete, doUpdate, ref if (!action && !['edit', 'add'].includes(modalAction.value)) { return false } - if (!(await validation())) return false + await validation() const actions = { add: { api: () => doCreate(modalForm.value), diff --git a/src/composables/useForm.js b/src/composables/useForm.js index 66782db..ef60157 100644 --- a/src/composables/useForm.js +++ b/src/composables/useForm.js @@ -9,14 +9,6 @@ export const useForm = (initFormData = {}) => { const formRef = ref(null) const formModel = ref({ ...initFormData }) - async function validation() { - try { - await formRef.value?.validate() - return true - } catch (error) { - return false - } - } const rules = { required: { required: true, @@ -24,5 +16,8 @@ export const useForm = (initFormData = {}) => { trigger: ['blur', 'change'], }, } + const validation = () => { + return formRef.value?.validate() + } return [formRef, formModel, validation, rules] } diff --git a/src/views/pms/resource/components/ResAddOrEdit.vue b/src/views/pms/resource/components/ResAddOrEdit.vue index 55dd4dd..ab0b1e9 100644 --- a/src/views/pms/resource/components/ResAddOrEdit.vue +++ b/src/views/pms/resource/components/ResAddOrEdit.vue @@ -177,7 +177,7 @@ function handleOpen(options = {}) { } async function onSave() { - if (!(await validation())) return + await validation() okLoading.value = true try { if (!modalForm.value.parentId) modalForm.value.parentId = null diff --git a/src/views/profile/index.vue b/src/views/profile/index.vue index 7bc7229..d330589 100644 --- a/src/views/profile/index.vue +++ b/src/views/profile/index.vue @@ -113,7 +113,7 @@ const [pwdModalRef] = useModal() const [pwdFormRef, pwdForm, pwdValidation] = useForm() async function handlePwdSave() { - if (!(await pwdValidation())) return false + await pwdValidation() await api.changePassword(pwdForm.value) $message.success('密码修改成功') userStore.getUserInfo() @@ -145,7 +145,7 @@ const [profileFormRef, profileForm, profileValidation] = useForm({ email: userStore.userInfo?.email, }) async function handleProfileSave() { - if (!(await profileValidation())) return false + await profileValidation() await api.updateProfile(profileForm.value) $message.success('资料修改成功') userStore.getUserInfo()