Merge branch 'ft_local_dev' into 'main'

fix:新增租户管理员点击确定按钮，服务端未响应数据导致按钮loading消失

See merge request huang/yun-teng-iot-front!432

@@ -144,8 +144,8 @@
       const getTitle = computed(() => (!unref(isUpdate) ? '新增租户管理员' : '编辑租户管理员'));
       const getTitle = computed(() => (!unref(isUpdate) ? '新增租户管理员' : '编辑租户管理员'));
 
 
       async function handleSubmit() {
       async function handleSubmit() {
-        setDrawerProps({ confirmLoading: true });
         try {
         try {
+          setDrawerProps({ confirmLoading: true });
           const values = await validate();
           const values = await validate();
           const requestParams = {
           const requestParams = {
             id: values.id,
             id: values.id,
@@ -160,15 +160,16 @@
                 : null,
                 : null,
             tenantId: tenantId.value,
             tenantId: tenantId.value,
           };
           };
-          saveTenantAdmin(requestParams as any as UserDTO).then(() => {
-            closeDrawer(); //关闭侧框
-            emit('success');
-          });
-        } finally {
-          setTimeout(() => {
-            setDrawerProps({ confirmLoading: false });
-          }, 300);
-        }
+          saveTenantAdmin(requestParams as any as UserDTO)
+            .then(() => {
+              closeDrawer(); //关闭侧框
+              emit('success');
+              setDrawerProps({ confirmLoading: false });
+            })
+            .catch(() => {
+              setDrawerProps({ confirmLoading: false });
+            });
+        } catch {}
       }
       }
 
 
       return {
       return {