Просмотр исходного кода

fix: 管理后台低网模式请求延迟

“ystl_myq” 2 месяцев назад
Родитель
Сommit
07dffed403

+ 35 - 14
src/views/background/framework/roles/rolePower.vue

@@ -94,21 +94,42 @@ const postPageRoleApi = async () => {
 // 自定义角色
 // 查看角色组
 const bgColor = ref(null);
-onMounted(() => {
-  postPageRoleApi();
-  setTimeout(() => {
+onMounted(async () => {
+  // 低网模式 等待 postPageRoleApi 完成
+  await postPageRoleApi();
+  // setTimeout(() => {
+  //   formLink.targetCodes = [];
+  //     console.log("123测试的撒大",rolesList.data[0])
+  //   formLink.targetCodes.push(rolesList.data[0]?.roleCode);
+  //   bgColor.value = rolesList.data[0]?.roleCode;
+  //   paramsPageUser.roleName = rolesList.data[0]?.roleName;
+  //   paramsPageUser.roleCode = rolesList.data[0]?.roleCode;
+  //   rolesList.rolesName = rolesList.data[0]?.roleName;
+  //   Object.assign(rolesList.addPerson, rolesList.data[0]);
+  //   getMenuListApi();
+  //   postPageUserByRoleApi();
+  //   getUserPermissionsByRoleCodeApi(rolesList.data[0]?.roleCode);
+  //   getMenuListCodeForRoleApi(rolesList.data[0]);
+  // }, 500);
+  if (rolesList.data.length > 0) {
+    const firstRole = rolesList.data[0];
     formLink.targetCodes = [];
-    formLink.targetCodes.push(rolesList.data[0]?.roleCode);
-    bgColor.value = rolesList.data[0]?.roleCode;
-    paramsPageUser.roleName = rolesList.data[0]?.roleName;
-    paramsPageUser.roleCode = rolesList.data[0]?.roleCode;
-    rolesList.rolesName = rolesList.data[0]?.roleName;
-    Object.assign(rolesList.addPerson, rolesList.data[0]);
-    getMenuListApi();
-    postPageUserByRoleApi();
-    getUserPermissionsByRoleCodeApi(rolesList.data[0]?.roleCode);
-    getMenuListCodeForRoleApi(rolesList.data[0]);
-  }, 500);
+    console.log("123测试的撒大", firstRole);
+
+    formLink.targetCodes.push(firstRole.roleCode);
+    bgColor.value = firstRole.roleCode;
+    paramsPageUser.roleName = firstRole.roleName;
+    paramsPageUser.roleCode = firstRole.roleCode;
+    rolesList.rolesName = firstRole.roleName;
+    Object.assign(rolesList.addPerson, firstRole);
+
+    await Promise.all([
+      getMenuListApi(),
+      postPageUserByRoleApi(),
+      getUserPermissionsByRoleCodeApi(firstRole.roleCode),
+      getMenuListCodeForRoleApi(firstRole)
+    ]);
+  }
 });
 const lookRoles = item => {
   paramsPageUser.roleName = item.roleName;

+ 18 - 10
src/views/background/framework/users/index.vue

@@ -62,21 +62,28 @@ const postPageGroupApi = async () => {
     });
   }
 };
-onMounted(() => {
-  postPageGroupApi();
-  setTimeout(() => {
+onMounted(async () => {
+  // 低网模式 等待 postPageRoleApi 完成
+  await postPageGroupApi();
+  if (rolesList.data.length > 0) {
     formLink.targetCodes = [];
     rolesList.rolesName = rolesList.perName;
     bgColor.value = rolesList.perOne;
     Object.assign(rolesList.addPerson, rolesList.data[0]);
-    UserTable?.value?.handleNodeClick(rolesList.data[0], "group");
-    addPersonClick.value = UserTable?.value?.handleNodeClick(
-      rolesList.data[0],
-      "group"
-    );
+
     paramsItem.value = rolesList.data[0];
     formLink.targetCodes.push(rolesList.data[0].groupCode);
-  }, 500);
+    await Promise.all([
+      UserTable?.value?.handleNodeClick(rolesList.data[0], "group"),
+      (addPersonClick.value = UserTable?.value?.handleNodeClick(
+        rolesList.data[0],
+        "group"
+      ))
+    ]);
+  }
+  // setTimeout(() => {
+
+  // }, 500);
 });
 // 查看角色组
 const paramsItem = ref();
@@ -125,7 +132,7 @@ const postDelUserGroupApi = async row => {
 const deleteUsers = row => {
   console.log(row);
   ElMessageBox.confirm(
-    `角色删除不能恢复,是否确认删除用户组【${row.groupName}】吗`,
+    `用户组删除不能恢复,是否确认删除用户组【${row.groupName}】吗`,
     "确定删除该用户组吗?",
     {
       confirmButtonText: "确定",
@@ -344,6 +351,7 @@ const addPersonClickList = () => {
 }
 
 .infinite-list {
+  overflow-y: auto;
   -ms-overflow-style: none;
 
   /* IE和Edge */