Pre Merge pull request !177 from 简佳/master

apps/web-antd/src/views/system/role/modules/assign-data-permission-form.vue

@@ -74,11 +74,11 @@ const [Modal, modalApi] = useVbenModal({
     }
     modalApi.lock();
     try {
-      await formApi.setValues(await getRole(data.id as number));
-
       // 加载部门列表
       await loadDeptTree();
       toggleExpandAll();
+      // 设置表单值, 一定要在加载树之后
+      await formApi.setValues(await getRole(data.id as number));
     } finally {
       modalApi.unlock();
     }

apps/web-antd/src/views/system/role/modules/assign-menu-form.vue

@@ -72,13 +72,13 @@ const [Modal, modalApi] = useVbenModal({
     }
     modalApi.lock();
     try {
-      await formApi.setValues(data);
-
       // 加载角色菜单
       const menuIds = await getRoleMenuList(data.id as number);
       await formApi.setFieldValue('menuIds', menuIds);
       // 加载菜单列表
       await loadMenuTree();
+
+      await formApi.setValues(data);
     } finally {
       modalApi.unlock();
     }

apps/web-ele/src/views/system/role/modules/assign-data-permission-form.vue

@@ -74,11 +74,11 @@ const [Modal, modalApi] = useVbenModal({
     }
     modalApi.lock();
     try {
-      await formApi.setValues(await getRole(data.id as number));
-
       // 加载部门列表
       await loadDeptTree();
       toggleExpandAll();
+      // 设置表单值, 一定要在加载树之后
+      await formApi.setValues(await getRole(data.id as number));
     } finally {
       modalApi.unlock();
     }

apps/web-ele/src/views/system/role/modules/assign-menu-form.vue

@@ -69,13 +69,13 @@ const [Modal, modalApi] = useVbenModal({
     }
     modalApi.lock();
     try {
-      await formApi.setValues(data);
-
       // 加载角色菜单
       const menuIds = await getRoleMenuList(data.id as number);
       await formApi.setFieldValue('menuIds', menuIds);
       // 加载菜单列表
       await loadMenuTree();
+
+      await formApi.setValues(data);
     } finally {
       modalApi.unlock();
     }

apps/web-naive/src/views/system/role/modules/assign-data-permission-form.vue

@@ -75,11 +75,11 @@ const [Modal, modalApi] = useVbenModal({
     }
     modalApi.lock();
     try {
-      await formApi.setValues(await getRole(data.id as number));
-
       // 加载部门列表
       await loadDeptTree();
       toggleExpandAll();
+      // 设置表单值, 一定要在加载树之后
+      await formApi.setValues(await getRole(data.id as number));
     } finally {
       modalApi.unlock();
     }

apps/web-naive/src/views/system/role/modules/assign-menu-form.vue

@@ -69,13 +69,13 @@ const [Modal, modalApi] = useVbenModal({
     }
     modalApi.lock();
     try {
-      await formApi.setValues(data);
-
       // 加载角色菜单
       const menuIds = await getRoleMenuList(data.id as number);
       await formApi.setFieldValue('menuIds', menuIds);
       // 加载菜单列表
       await loadMenuTree();
+
+      await formApi.setValues(data);
     } finally {
       modalApi.unlock();
     }

playground/src/views/system/role/modules/form.vue

@@ -47,10 +47,13 @@ const [Drawer, drawerApi] = useVbenDrawer({
         drawerApi.unlock();
       });
   },
-  onOpenChange(isOpen) {
+  async onOpenChange(isOpen) {
     if (isOpen) {
       const data = drawerApi.getData<SystemRoleApi.SystemRole>();
       formApi.resetForm();
+      if (permissions.value.length === 0) {
+        await loadPermissions();
+      }
       if (data) {
         formData.value = data;
         id.value = data.id;
@@ -58,10 +61,6 @@ const [Drawer, drawerApi] = useVbenDrawer({
       } else {
         id.value = undefined;
       }
-
-      if (permissions.value.length === 0) {
-        loadPermissions();
-      }
     }
   },
 });