diff --git a/src/components/me/modal/index.vue b/src/components/me/modal/index.vue index b312034..b74f2c0 100644 --- a/src/components/me/modal/index.vue +++ b/src/components/me/modal/index.vue @@ -1,7 +1,7 @@ @@ -80,11 +80,11 @@ const props = defineProps({ }, style: { type: Object, - default: () => ({}), + default: () => {}, }, contentStyle: { type: Object, - default: () => ({}), + default: () => {}, }, onOk: { type: Function, @@ -125,7 +125,7 @@ async function handleOk(data) { // 如果onOk函数的返回值不为false,则关闭模态框 res !== false && close() } catch (error) { - // 如果出现异常,则打印错误信息 + okLoading.value = false console.error(error) } } @@ -143,7 +143,7 @@ async function handleCancel(data) { // 如果onCancel函数的返回值不为false,则关闭模态框 res !== false && close() } catch (error) { - // 如果出现异常,则打印错误信息 + okLoading.value = false console.error(error) } } diff --git a/src/composables/useCrud.js b/src/composables/useCrud.js index 61b2c71..656c4f5 100644 --- a/src/composables/useCrud.js +++ b/src/composables/useCrud.js @@ -1,7 +1,7 @@ /********************************** * @Author: Ronnie Zhang * @LastEditor: Ronnie Zhang - * @LastEditTime: 2023/12/05 21:22:35 + * @LastEditTime: 2023/12/12 09:03:00 * @Email: zclzone@outlook.com * Copyright © 2023 Ronnie Zhang(大脸怪) | https://isme.top **********************************/ @@ -79,6 +79,7 @@ export const useCrud = ({ name, initForm = {}, doCreate, doDelete, doUpdate, ref data && refresh(data) } catch (error) { okLoading.value = false + return false } } diff --git a/src/layouts/components/RoleSelect.vue b/src/layouts/components/RoleSelect.vue index 4cf0fa1..5431051 100644 --- a/src/layouts/components/RoleSelect.vue +++ b/src/layouts/components/RoleSelect.vue @@ -1,7 +1,7 @@ @@ -69,6 +69,7 @@ async function setCurrentRole() { } catch (error) { console.error(error) okLoading.value = false + return false } } diff --git a/src/views/pms/resource/components/ResAddOrEdit.vue b/src/views/pms/resource/components/ResAddOrEdit.vue index f4b62ee..55dd4dd 100644 --- a/src/views/pms/resource/components/ResAddOrEdit.vue +++ b/src/views/pms/resource/components/ResAddOrEdit.vue @@ -1,7 +1,7 @@ @@ -190,8 +190,9 @@ async function onSave() { $message.success('保存成功') emit('refresh', modalForm.value) } catch (error) { - okLoading.value = false console.error(error) + okLoading.value = false + return false } }