From 62fb5b7fe06360e14ee6f48c0a459ccd841199f8 Mon Sep 17 00:00:00 2001
From: zclzone <zclzone@outlook.com>
Date: Tue, 12 Dec 2023 09:04:01 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E5=BC=B9=E7=AA=97=E5=9C=A8=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E6=8A=A5=E9=94=99=E6=97=B6=E4=B8=8D=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/me/modal/index.vue                  | 10 +++++-----
 src/composables/useCrud.js                         |  3 ++-
 src/layouts/components/RoleSelect.vue              |  3 ++-
 src/views/pms/resource/components/ResAddOrEdit.vue |  5 +++--
 4 files changed, 12 insertions(+), 9 deletions(-)

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 @@
 <!--------------------------------
  - @Author: Ronnie Zhang
  - @LastEditor: Ronnie Zhang
- - @LastEditTime: 2023/12/04 22:51:58
+ - @LastEditTime: 2023/12/12 09:03:22
  - @Email: zclzone@outlook.com
  - Copyright © 2023 Ronnie Zhang(大脸怪) | https://isme.top
  --------------------------------->
@@ -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 @@
 <!--------------------------------
  - @Author: Ronnie Zhang
  - @LastEditor: Ronnie Zhang
- - @LastEditTime: 2023/12/05 21:23:12
+ - @LastEditTime: 2023/12/12 09:03:32
  - @Email: zclzone@outlook.com
  - Copyright © 2023 Ronnie Zhang(大脸怪) | https://isme.top
  --------------------------------->
@@ -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 @@
 <!--------------------------------
  - @Author: Ronnie Zhang
  - @LastEditor: Ronnie Zhang
- - @LastEditTime: 2023/12/05 21:29:12
+ - @LastEditTime: 2023/12/12 09:03:43
  - @Email: zclzone@outlook.com
  - Copyright © 2023 Ronnie Zhang(大脸怪) | https://isme.top
  --------------------------------->
@@ -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
   }
 }