diff --git a/src/views/base/profile/PasswordModal.vue b/src/views/base/profile/PasswordModal.vue
index a8867b7..61dff30 100644
--- a/src/views/base/profile/PasswordModal.vue
+++ b/src/views/base/profile/PasswordModal.vue
@@ -38,8 +38,8 @@ async function handleSubmit() {
     setModalProps({ confirmLoading: true })
     closeModal()
     emit('success')
-  } finally {
     createMessage.success(t('common.saveSuccessText'))
+  } finally {
     setModalProps({ confirmLoading: false })
   }
 }
diff --git a/src/views/bpm/group/GroupModal.vue b/src/views/bpm/group/GroupModal.vue
index 4f215d0..3248e88 100644
--- a/src/views/bpm/group/GroupModal.vue
+++ b/src/views/bpm/group/GroupModal.vue
@@ -46,8 +46,8 @@ async function handleSubmit() {
     }
     closeModal()
     emit('success')
-  } finally {
     createMessage.success(t('common.saveSuccessText'))
+  } finally {
     setModalProps({ confirmLoading: false })
   }
 }
diff --git a/src/views/bpm/model/ModelModal.vue b/src/views/bpm/model/ModelModal.vue
index 6576461..6fc213a 100644
--- a/src/views/bpm/model/ModelModal.vue
+++ b/src/views/bpm/model/ModelModal.vue
@@ -46,8 +46,8 @@ async function handleSubmit() {
     }
     closeModal()
     emit('success')
-  } finally {
     createMessage.success(t('common.saveSuccessText'))
+  } finally {
     setModalProps({ confirmLoading: false })
   }
 }
diff --git a/src/views/infra/config/ConfigModal.vue b/src/views/infra/config/ConfigModal.vue
index b84ce6c..6b4749d 100644
--- a/src/views/infra/config/ConfigModal.vue
+++ b/src/views/infra/config/ConfigModal.vue
@@ -46,8 +46,8 @@ async function handleSubmit() {
     }
     closeModal()
     emit('success')
-  } finally {
     createMessage.success(t('common.saveSuccessText'))
+  } finally {
     setModalProps({ confirmLoading: false })
   }
 }
diff --git a/src/views/infra/dataSourceConfig/DataSourceConfigModal.vue b/src/views/infra/dataSourceConfig/DataSourceConfigModal.vue
index df55854..f3b276f 100644
--- a/src/views/infra/dataSourceConfig/DataSourceConfigModal.vue
+++ b/src/views/infra/dataSourceConfig/DataSourceConfigModal.vue
@@ -46,8 +46,8 @@ async function handleSubmit() {
     }
     closeModal()
     emit('success')
-  } finally {
     createMessage.success(t('common.saveSuccessText'))
+  } finally {
     setModalProps({ confirmLoading: false })
   }
 }
diff --git a/src/views/infra/job/JobModal.vue b/src/views/infra/job/JobModal.vue
index c2e3b32..edd82cc 100644
--- a/src/views/infra/job/JobModal.vue
+++ b/src/views/infra/job/JobModal.vue
@@ -46,8 +46,8 @@ async function handleSubmit() {
     }
     closeModal()
     emit('success')
-  } finally {
     createMessage.success(t('common.saveSuccessText'))
+  } finally {
     setModalProps({ confirmLoading: false })
   }
 }
diff --git a/src/views/mp/account/AccountModal.vue b/src/views/mp/account/AccountModal.vue
index e9f0386..b1f3e06 100644
--- a/src/views/mp/account/AccountModal.vue
+++ b/src/views/mp/account/AccountModal.vue
@@ -46,8 +46,8 @@ async function handleSubmit() {
     }
     closeModal()
     emit('success')
-  } finally {
     createMessage.success(t('common.saveSuccessText'))
+  } finally {
     setModalProps({ confirmLoading: false })
   }
 }
diff --git a/src/views/mp/message/MessageModal.vue b/src/views/mp/message/MessageModal.vue
index 62696a1..cf58932 100644
--- a/src/views/mp/message/MessageModal.vue
+++ b/src/views/mp/message/MessageModal.vue
@@ -40,8 +40,8 @@ async function handleSubmit() {
     await sendMessage(values)
     closeModal()
     emit('success')
-  } finally {
     createMessage.success(t('common.saveSuccessText'))
+  } finally {
     setModalProps({ confirmLoading: false })
   }
 }
diff --git a/src/views/mp/tag/TagModal.vue b/src/views/mp/tag/TagModal.vue
index 0b8069a..72a5078 100644
--- a/src/views/mp/tag/TagModal.vue
+++ b/src/views/mp/tag/TagModal.vue
@@ -46,8 +46,8 @@ async function handleSubmit() {
     }
     closeModal()
     emit('success')
-  } finally {
     createMessage.success(t('common.saveSuccessText'))
+  } finally {
     setModalProps({ confirmLoading: false })
   }
 }
diff --git a/src/views/mp/user/MpUserModal.vue b/src/views/mp/user/MpUserModal.vue
index 9264e3d..f3d1aff 100644
--- a/src/views/mp/user/MpUserModal.vue
+++ b/src/views/mp/user/MpUserModal.vue
@@ -37,8 +37,8 @@ async function handleSubmit() {
     await updateUser(values)
     closeModal()
     emit('success')
-  } finally {
     createMessage.success(t('common.saveSuccessText'))
+  } finally {
     setModalProps({ confirmLoading: false })
   }
 }
diff --git a/src/views/pay/app/AppModal.vue b/src/views/pay/app/AppModal.vue
index 305d7ed..a0cffd6 100644
--- a/src/views/pay/app/AppModal.vue
+++ b/src/views/pay/app/AppModal.vue
@@ -46,8 +46,8 @@ async function handleSubmit() {
     }
     closeModal()
     emit('success')
-  } finally {
     createMessage.success(t('common.saveSuccessText'))
+  } finally {
     setModalProps({ confirmLoading: false })
   }
 }
diff --git a/src/views/pay/merchant/MerchantModal.vue b/src/views/pay/merchant/MerchantModal.vue
index cb68c12..c1df72b 100644
--- a/src/views/pay/merchant/MerchantModal.vue
+++ b/src/views/pay/merchant/MerchantModal.vue
@@ -46,8 +46,8 @@ async function handleSubmit() {
     }
     closeModal()
     emit('success')
-  } finally {
     createMessage.success(t('common.saveSuccessText'))
+  } finally {
     setModalProps({ confirmLoading: false })
   }
 }
diff --git a/src/views/system/dept/DeptModal.vue b/src/views/system/dept/DeptModal.vue
index 67f43cf..8d28682 100644
--- a/src/views/system/dept/DeptModal.vue
+++ b/src/views/system/dept/DeptModal.vue
@@ -46,8 +46,8 @@ async function handleSubmit() {
     }
     closeModal()
     emit('success')
-  } finally {
     createMessage.success(t('common.saveSuccessText'))
+  } finally {
     setModalProps({ confirmLoading: false })
   }
 }
diff --git a/src/views/system/dict/DictDataModal.vue b/src/views/system/dict/DictDataModal.vue
index b833d76..514f0a0 100644
--- a/src/views/system/dict/DictDataModal.vue
+++ b/src/views/system/dict/DictDataModal.vue
@@ -50,8 +50,8 @@ async function handleSubmit() {
     }
     closeModal()
     emit('success')
-  } finally {
     createMessage.success(t('common.saveSuccessText'))
+  } finally {
     setModalProps({ confirmLoading: false })
   }
 }
diff --git a/src/views/system/dict/DictTypeModal.vue b/src/views/system/dict/DictTypeModal.vue
index 7efaea3..f0d3b76 100644
--- a/src/views/system/dict/DictTypeModal.vue
+++ b/src/views/system/dict/DictTypeModal.vue
@@ -46,8 +46,8 @@ async function handleSubmit() {
     }
     closeModal()
     emit('success')
-  } finally {
     createMessage.success(t('common.saveSuccessText'))
+  } finally {
     setModalProps({ confirmLoading: false })
   }
 }
diff --git a/src/views/system/errorCode/ErrorCodeModal.vue b/src/views/system/errorCode/ErrorCodeModal.vue
index 7083de0..8864fda 100644
--- a/src/views/system/errorCode/ErrorCodeModal.vue
+++ b/src/views/system/errorCode/ErrorCodeModal.vue
@@ -46,8 +46,8 @@ async function handleSubmit() {
     }
     closeModal()
     emit('success')
-  } finally {
     createMessage.success(t('common.saveSuccessText'))
+  } finally {
     setModalProps({ confirmLoading: false })
   }
 }
diff --git a/src/views/system/mail/account/AccountModal.vue b/src/views/system/mail/account/AccountModal.vue
index f56ebb9..f523176 100644
--- a/src/views/system/mail/account/AccountModal.vue
+++ b/src/views/system/mail/account/AccountModal.vue
@@ -46,8 +46,8 @@ async function handleSubmit() {
     }
     closeModal()
     emit('success')
-  } finally {
     createMessage.success(t('common.saveSuccessText'))
+  } finally {
     setModalProps({ confirmLoading: false })
   }
 }
diff --git a/src/views/system/mail/template/TemplateModal.vue b/src/views/system/mail/template/TemplateModal.vue
index 0059b28..941cee4 100644
--- a/src/views/system/mail/template/TemplateModal.vue
+++ b/src/views/system/mail/template/TemplateModal.vue
@@ -46,8 +46,8 @@ async function handleSubmit() {
     }
     closeModal()
     emit('success')
-  } finally {
     createMessage.success(t('common.saveSuccessText'))
+  } finally {
     setModalProps({ confirmLoading: false })
   }
 }
diff --git a/src/views/system/menu/MenuModal.vue b/src/views/system/menu/MenuModal.vue
index 239e55a..d20b45a 100644
--- a/src/views/system/menu/MenuModal.vue
+++ b/src/views/system/menu/MenuModal.vue
@@ -46,8 +46,8 @@ async function handleSubmit() {
     }
     closeModal()
     emit('success')
-  } finally {
     createMessage.success(t('common.saveSuccessText'))
+  } finally {
     setModalProps({ confirmLoading: false })
   }
 }
diff --git a/src/views/system/notice/NoticeModal.vue b/src/views/system/notice/NoticeModal.vue
index 0a493a8..aba908a 100644
--- a/src/views/system/notice/NoticeModal.vue
+++ b/src/views/system/notice/NoticeModal.vue
@@ -51,8 +51,8 @@ async function handleSubmit() {
     }
     closeModal()
     emit('success')
-  } finally {
     createMessage.success(t('common.saveSuccessText'))
+  } finally {
     setModalProps({ confirmLoading: false })
   }
 }
diff --git a/src/views/system/notify/template/TemplateModal.vue b/src/views/system/notify/template/TemplateModal.vue
index 09d165b..000812c 100644
--- a/src/views/system/notify/template/TemplateModal.vue
+++ b/src/views/system/notify/template/TemplateModal.vue
@@ -46,8 +46,8 @@ async function handleSubmit() {
     }
     closeModal()
     emit('success')
-  } finally {
     createMessage.success(t('common.saveSuccessText'))
+  } finally {
     setModalProps({ confirmLoading: false })
   }
 }
diff --git a/src/views/system/oauth2/client/ClientModal.vue b/src/views/system/oauth2/client/ClientModal.vue
index 381d223..42a9f71 100644
--- a/src/views/system/oauth2/client/ClientModal.vue
+++ b/src/views/system/oauth2/client/ClientModal.vue
@@ -46,8 +46,8 @@ async function handleSubmit() {
     }
     closeModal()
     emit('success')
-  } finally {
     createMessage.success(t('common.saveSuccessText'))
+  } finally {
     setModalProps({ confirmLoading: false })
   }
 }
diff --git a/src/views/system/post/PostModal.vue b/src/views/system/post/PostModal.vue
index 9883064..f4187f5 100644
--- a/src/views/system/post/PostModal.vue
+++ b/src/views/system/post/PostModal.vue
@@ -46,8 +46,8 @@ async function handleSubmit() {
     }
     closeModal()
     emit('success')
-  } finally {
     createMessage.success(t('common.saveSuccessText'))
+  } finally {
     setModalProps({ confirmLoading: false })
   }
 }
diff --git a/src/views/system/role/RoleMenuModal.vue b/src/views/system/role/RoleMenuModal.vue
index a4d0c3f..2b688ec 100644
--- a/src/views/system/role/RoleMenuModal.vue
+++ b/src/views/system/role/RoleMenuModal.vue
@@ -70,8 +70,8 @@ async function handleSubmit() {
     })
     closeModal()
     emit('success')
-  } finally {
     createMessage.success(t('common.saveSuccessText'))
+  } finally {
     setModalProps({ confirmLoading: false })
   }
 }
diff --git a/src/views/system/role/RoleModal.vue b/src/views/system/role/RoleModal.vue
index 19843ac..2f9df6b 100644
--- a/src/views/system/role/RoleModal.vue
+++ b/src/views/system/role/RoleModal.vue
@@ -46,8 +46,8 @@ async function handleSubmit() {
     }
     closeModal()
     emit('success')
-  } finally {
     createMessage.success(t('common.saveSuccessText'))
+  } finally {
     setModalProps({ confirmLoading: false })
   }
 }
diff --git a/src/views/system/role/RoleScopeModal.vue b/src/views/system/role/RoleScopeModal.vue
index dfaee0c..0e93236 100644
--- a/src/views/system/role/RoleScopeModal.vue
+++ b/src/views/system/role/RoleScopeModal.vue
@@ -60,8 +60,8 @@ async function handleSubmit() {
     await assignRoleDataScope(values)
     closeModal()
     emit('success')
-  } finally {
     createMessage.success(t('common.saveSuccessText'))
+  } finally {
     setModalProps({ confirmLoading: false })
   }
 }
diff --git a/src/views/system/sensitiveWord/SensitiveWordModal.vue b/src/views/system/sensitiveWord/SensitiveWordModal.vue
index 02412e4..a27bd24 100644
--- a/src/views/system/sensitiveWord/SensitiveWordModal.vue
+++ b/src/views/system/sensitiveWord/SensitiveWordModal.vue
@@ -46,8 +46,8 @@ async function handleSubmit() {
     }
     closeModal()
     emit('success')
-  } finally {
     createMessage.success(t('common.saveSuccessText'))
+  } finally {
     setModalProps({ confirmLoading: false })
   }
 }
diff --git a/src/views/system/sms/channel/SmsChannelModal.vue b/src/views/system/sms/channel/SmsChannelModal.vue
index 8a23684..eba9a5e 100644
--- a/src/views/system/sms/channel/SmsChannelModal.vue
+++ b/src/views/system/sms/channel/SmsChannelModal.vue
@@ -46,8 +46,8 @@ async function handleSubmit() {
     }
     closeModal()
     emit('success')
-  } finally {
     createMessage.success(t('common.saveSuccessText'))
+  } finally {
     setModalProps({ confirmLoading: false })
   }
 }
diff --git a/src/views/system/sms/template/SmsTemplateModal.vue b/src/views/system/sms/template/SmsTemplateModal.vue
index 303fa23..fef528e 100644
--- a/src/views/system/sms/template/SmsTemplateModal.vue
+++ b/src/views/system/sms/template/SmsTemplateModal.vue
@@ -46,8 +46,8 @@ async function handleSubmit() {
     }
     closeModal()
     emit('success')
-  } finally {
     createMessage.success(t('common.saveSuccessText'))
+  } finally {
     setModalProps({ confirmLoading: false })
   }
 }
diff --git a/src/views/system/tenant/TenantModal.vue b/src/views/system/tenant/TenantModal.vue
index 44e8c5b..65c5a97 100644
--- a/src/views/system/tenant/TenantModal.vue
+++ b/src/views/system/tenant/TenantModal.vue
@@ -46,8 +46,8 @@ async function handleSubmit() {
     }
     closeModal()
     emit('success')
-  } finally {
     createMessage.success(t('common.saveSuccessText'))
+  } finally {
     setModalProps({ confirmLoading: false })
   }
 }
diff --git a/src/views/system/tenantPackage/TenantPackageModal.vue b/src/views/system/tenantPackage/TenantPackageModal.vue
index cd11e6b..8a39b83 100644
--- a/src/views/system/tenantPackage/TenantPackageModal.vue
+++ b/src/views/system/tenantPackage/TenantPackageModal.vue
@@ -73,8 +73,8 @@ async function handleSubmit() {
     }
     closeModal()
     emit('success')
-  } finally {
     createMessage.success(t('common.saveSuccessText'))
+  } finally {
     setModalProps({ confirmLoading: false })
   }
 }
diff --git a/src/views/system/user/ResetPwdModal.vue b/src/views/system/user/ResetPwdModal.vue
index ac3b83f..87e52a5 100644
--- a/src/views/system/user/ResetPwdModal.vue
+++ b/src/views/system/user/ResetPwdModal.vue
@@ -39,8 +39,8 @@ async function handleSubmit() {
     setModalProps({ confirmLoading: true })
     closeModal()
     emit('success')
-  } finally {
     createMessage.success(t('common.saveSuccessText'))
+  } finally {
     setModalProps({ confirmLoading: false })
   }
 }
diff --git a/src/views/system/user/UserModal.vue b/src/views/system/user/UserModal.vue
index bd351e8..5561ab0 100644
--- a/src/views/system/user/UserModal.vue
+++ b/src/views/system/user/UserModal.vue
@@ -46,8 +46,8 @@ async function handleSubmit() {
     }
     closeModal()
     emit('success')
-  } finally {
     createMessage.success(t('common.saveSuccessText'))
+  } finally {
     setModalProps({ confirmLoading: false })
   }
 }
diff --git a/src/views/system/user/UserRoleModal.vue b/src/views/system/user/UserRoleModal.vue
index ca7dc75..0d8575a 100644
--- a/src/views/system/user/UserRoleModal.vue
+++ b/src/views/system/user/UserRoleModal.vue
@@ -41,8 +41,8 @@ async function handleSubmit() {
     await assignUserRole({ userId: values.id, roleIds: values.roleIds })
     closeModal()
     emit('success')
-  } finally {
     createMessage.success(t('common.saveSuccessText'))
+  } finally {
     setModalProps({ confirmLoading: false })
   }
 }