fix：检查所有弹窗下方确认按钮加载显示

@@ -50,6 +50,7 @@
           ...data,
           severity: alarmLevel(data.severity),
           status: statusType(data.status),
+          details: JSON.stringify(data.details),
         });
         alarmStatus.value = data.status;
         alarmId.value = data.id;

@@ -62,7 +62,7 @@
         </template>
       </BasicTable>
     </PageWrapper>
-    <ContactDrawer @register="registerDrawer" @success="handleSuccess" />
+    <CameraDrawer @register="registerDrawer" @success="handleSuccess" />
     <VideoPreviewModal @register="registerModal" />
   </div>
 </template>
@@ -73,7 +73,7 @@
   import { PageWrapper } from '/@/components/Page';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useDrawer } from '/@/components/Drawer';
-  import ContactDrawer from './ContactDrawer.vue';
+  import CameraDrawer from './CameraDrawer.vue';
   import { useResetOrganizationTree, OrganizationIdTree } from '/@/views/common/organizationIdTree';
   import { cameraPage, deleteCameraManage } from '/@/api/camera/cameraManager';
   import { searchFormSchema, columns } from './config.data';
@@ -86,7 +86,7 @@
       OrganizationIdTree,
       BasicTable,
       TableAction,
-      ContactDrawer,
+      CameraDrawer,
       VideoPreviewModal,
       TableImg,
     },

@@ -26,9 +26,7 @@
         /></div>
       </div>
       <div style="float: right">
-        <Button :disabled="disStatus" type="primary" @click="handleSubmit" class="mr-2"
-          >确认</Button
-        >
+        <Button type="primary" @click="handleSubmit" class="mr-2">确认</Button>
         <Button type="default" @click="handleCancel" class="mr-2">取消</Button>
       </div>
     </BasicModal>
@@ -65,7 +63,6 @@
     emits: ['success', 'register'],
     setup(_, { emit }) {
       const { createMessage } = useMessage();
-      const disStatus = ref(false);
       const { proxy } = getCurrentInstance() as any;
       let allPostForm: any = reactive({});
       const getNameObj = reactive({
@@ -106,9 +103,11 @@
         editType.name = d.name;
       };
 
-      const [registerDrawer, { closeModal }] = useModalInner(async (data) => {
+      const [registerDrawer, { setModalProps, closeModal }] = useModalInner(async (data) => {
         isUpdate.value = !!data?.isUpdate;
         current.value = 0;
+        setModalProps({ confirmLoading: false });
+
         if (unref(isUpdate)) {
           editPostId.value = data.record.id;
           editNextType.type = data.record.type;
@@ -216,24 +215,26 @@
         }
       };
       const handleSubmit = async () => {
-        if (!unref(isUpdate)) {
-          disStatus.value = true;
-          await addOrEditFunc();
-          await postAddConvertApi(allPostForm);
-          createMessage.success('数据流转新增成功');
-          emit('success');
-          defineClearFunc();
-          closeModal();
-          setTimeout(() => {
-            disStatus.value = false;
-          }, 2000);
-        } else {
-          await addOrEditFunc();
-          await postAddConvertApi(allPostForm);
-          createMessage.success('数据流转编辑成功');
-          emit('success');
-          defineClearFunc();
-          closeModal();
+        try {
+          setModalProps({ confirmLoading: true });
+          if (!unref(isUpdate)) {
+            await addOrEditFunc();
+            await postAddConvertApi(allPostForm);
+            createMessage.success('数据流转新增成功');
+            emit('success');
+            defineClearFunc();
+            closeModal();
+          } else {
+            await addOrEditFunc();
+            await postAddConvertApi(allPostForm);
+            createMessage.success('数据流转编辑成功');
+            emit('success');
+            defineClearFunc();
+            closeModal();
+          }
+        } catch {
+        } finally {
+          setModalProps({ confirmLoading: false });
         }
       };
       return {
@@ -247,7 +248,6 @@
         getModeSelectVal,
         refTransferConfigParams,
         refTransferConfigMode,
-        disStatus,
       };
     },
   });

@@ -44,8 +44,9 @@
   const aceEditor = ref();
   const aceRef = ref();
   const getTitle = computed(() => (isUpdate.value ? '编辑转换脚本' : '新增转换脚本'));
-  const [register, { closeDrawer }] = useDrawerInner((data) => {
+  const [register, { setDrawerProps, closeDrawer }] = useDrawerInner((data) => {
     resetFields();
+    setDrawerProps({ confirmLoading: false });
     isUpdate.value = data.isUpdate;
     initEditor(data.record?.configuration.jsScript);
     if (isUpdate.value) {
@@ -85,6 +86,8 @@
   const handleSubmit = async () => {
     const fieldsValue = getFieldsValue();
     try {
+      setDrawerProps({ confirmLoading: true });
+
       await createOrEditTransformScriptApi({
         configuration: {
           jsScript: aceEditor.value.getValue(),
@@ -99,6 +102,8 @@
     } catch (e) {
       const { createMessage } = useMessage();
       createMessage.success('保存失败');
+    } finally {
+      setDrawerProps({ confirmLoading: false });
     }
   };
   const handleFormat = () => {

@@ -126,8 +126,7 @@
           };
           Reflect.set(values, 'meta', metaTemp);
           // saveMenu
-          const data = await saveMenuApi(values, isUpdate.value);
-          console.log('_______保存返回结果____data:' + data);
+          await saveMenuApi(values, isUpdate.value);
 
           closeDrawer(); //关闭侧框
           emit('success');

@@ -80,6 +80,7 @@
           );
           closeDrawer(); //关闭侧框
           emit('success');
+        } catch {
         } finally {
           setDrawerProps({ confirmLoading: false });
         }

@@ -95,7 +95,9 @@
           //通过角色id去获取角色对应的菜单的ids
           roleMenus.value = await getMenusIdsByRoleId(data.record.id);
           originMenus.value = [...roleMenus.value];
+
           for (let m of treeData.value) {
+            console.log(m);
             for (let m1 of roleMenus.value) {
               // 利用continue特性优化一下性能
               if (!(m.key === m1 && m.children.length)) continue;

@@ -90,19 +90,25 @@
       };
 
       async function handleSubmit() {
-        if (!unref(isUpdate)) {
-          getAllFieldsFunc();
-          await saveTenantProfileApi(postAllData);
-          createMessage.success('租户配置新增成功');
-          closeDrawer();
-          emit('success');
-          resetFields();
-        } else {
-          getAllFieldsFunc();
-          await saveTenantProfileApi(postAllData);
-          createMessage.success('租户配置编辑成功');
-          closeDrawer();
-          emit('success');
+        try {
+          setDrawerProps({ confirmLoading: true });
+          if (!unref(isUpdate)) {
+            getAllFieldsFunc();
+            await saveTenantProfileApi(postAllData);
+            createMessage.success('租户配置新增成功');
+            closeDrawer();
+            emit('success');
+            resetFields();
+          } else {
+            getAllFieldsFunc();
+            await saveTenantProfileApi(postAllData);
+            createMessage.success('租户配置编辑成功');
+            closeDrawer();
+            emit('success');
+          }
+        } catch (e) {
+        } finally {
+          setDrawerProps({ confirmLoading: false });
         }
       }
       return {

@@ -2,7 +2,6 @@
   <BasicDrawer
     v-bind="$attrs"
     @register="tenantAdminDrawer"
-    showFooter
     title="租户管理员"
     width="60%"
     @ok="handleSubmit"

@@ -26,7 +26,7 @@
   </BasicDrawer>
 </template>
 <script lang="ts">
-  import { defineComponent, ref, computed, unref } from 'vue';
+  import { defineComponent, ref, computed, unref, nextTick } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { formSchema } from './role.data';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
@@ -79,6 +79,7 @@
       }
       const originMenus = ref();
       const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
+        setDrawerProps({ confirmLoading: false });
         resetFields();
         roleId.value = '';
         // 在打开弹窗时清除所有选择的菜单
@@ -96,14 +97,23 @@
           //通过角色id去获取角色对应的菜单的ids
           roleMenus.value = await getMenusIdsByRoleId(data.record.id);
           originMenus.value = [...roleMenus.value];
+          const copyData = [];
+          Object.assign(copyData, roleMenus.value.slice(0, 5));
+          console.log('Query role ids', copyData);
+          console.log('TreeData ids', treeData.value);
           for (let m of treeData.value) {
             for (let m1 of roleMenus.value) {
               // 利用continue特性优化一下性能
-              if (!(m.key === m1 && m.children.length)) continue;
-              useChildrenIdsRemoveParentId(m1, roleMenus.value);
+              if (m.key != m1 && m?.children.length == 0) {
+                console.log(m1);
+                useChildrenIdsRemoveParentId(m1, roleMenus.value);
+              }
             }
           }
-          treeRef.value.setCheckedKeys(roleMenus.value);
+          console.log('Rolemenus', roleMenus.value);
+          nextTick(() => {
+            treeRef.value.setCheckedKeys(roleMenus.value);
+          });
           roleId.value = data.record.id;
           setFieldsValue(data.record);
         }
@@ -124,10 +134,12 @@
             roleType: RoleEnum.TENANT_ADMIN,
             menu: allCheckedKeys.value.length ? allCheckedKeys.value : originMenus.value,
           };
-          await saveOrUpdateRoleInfoWithMenu(req);
-          closeDrawer();
-          emit('success');
-          createMessage.success(`${unref(isUpdate) ? '编辑' : '新增'}成功`);
+          saveOrUpdateRoleInfoWithMenu(req).then(() => {
+            closeDrawer();
+            emit('success');
+            createMessage.success(`${unref(isUpdate) ? '编辑' : '新增'}成功`);
+          });
+        } catch {
         } finally {
           setDrawerProps({ confirmLoading: false });
         }