Merge branch 'dev' of gitee.com:yudaocode/yudao-ui-admin-vben into dev-dict

Signed-off-by: xingyu <xingyu4j@vip.qq.com>

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

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

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

@@ -75,7 +75,7 @@ const [Modal, modalApi] = useVbenModal({
     modalApi.lock();
     try {
       // 加载角色菜单
-      const menuIds = await getRoleMenuList(data.id as number);
+      const menuIds = await getRoleMenuList(data.id);
       await formApi.setFieldValue('menuIds', menuIds);
 
       await formApi.setValues(data);

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

@@ -65,7 +65,7 @@ const [Modal, modalApi] = useVbenModal({
     }
     modalApi.lock();
     try {
-      formData.value = await getRole(data.id as number);
+      formData.value = await getRole(data.id);
       // 设置到 values
       await formApi.setValues(formData.value);
     } finally {