merge: merge code && resolve conflict

@@ -144,8 +144,8 @@
       const getTitle = computed(() => (!unref(isUpdate) ? '新增租户管理员' : '编辑租户管理员'));
 
       async function handleSubmit() {
-        setDrawerProps({ confirmLoading: true });
         try {
+          setDrawerProps({ confirmLoading: true });
           const values = await validate();
           const requestParams = {
             id: values.id,