Merge branch 'fix-role-manange' into 'main_dev'

fix: 修复角色创建时选择菜单权限全部选择功能无效 See merge request yunteng/thingskit-front!612

Merge branch 'fix-role-manange' into 'main_dev'
fix: 修复角色创建时选择菜单权限全部选择功能无效 See merge request yunteng/thingskit-front!612
xp.Huang
2 parents 4e83af3f b0678edf
Showing 2 changed files with 12 additions and 27 deletions
src/views/system/role/RoleDrawer.vue
src/views/tenant/role/RoleDrawer.vue
--- a/src/views/system/role/RoleDrawer.vue
View file @c71159a
+++ b/src/views/system/role/RoleDrawer.vue
View file @c71159a
@@ -18,7 +18,6 @@
             :treeData="treeData"
             :replace-fields="{ title: 'name', key: 'id' }"
             :checkedKeys="roleMenus"
-            @check="handleCheckClick"
             title="菜单分配"
           />
         </Spin>
@@ -31,7 +30,7 @@
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { formSchema, KeysTypeEnum, RoleMenuDictEnum } from './role.data';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  import { BasicTree, TreeItem } from '/@/components/Tree';
+  import { BasicTree, TreeActionType, TreeItem } from '/@/components/Tree';
   import { useMessage } from '/@/hooks/web/useMessage';
   const { t } = useI18n(); //加载国际化
   // 加载菜单数据
@@ -55,9 +54,8 @@
       const isUpdate = ref<boolean>(true);
       const treeData = ref<TreeData[]>([]);
       const roleMenus = ref<string[]>([]);
-      const allCheckedKeys = ref<string[]>([]);
       const roleId = ref<string>('');
-      const treeRef = ref();
+      const treeRef = ref<Nullable<TreeActionType>>();
       const checked = ref<string[]>([]); //需要选中的节点
       const spinning = ref(false);
@@ -80,7 +78,6 @@
       const { isTenantAdmin, isSysadmin, getRole } = useRole();
       const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(
         async (data: { isUpdate: boolean; record: RoleListItem }) => {
-          allCheckedKeys.value = [];
           resetFields();
           roleId.value = '';
           // 在打开弹窗时清除所有选择的菜单
@@ -129,10 +126,10 @@
               roleId.value = data.record.id;
               //通过角色id去获取角色对应的菜单的ids
-              allCheckedKeys.value = roleMenus.value = await getMenusIdsByRoleId(data.record.id);
+              roleMenus.value = await getMenusIdsByRoleId(data.record.id);
               excludeHalfCheckedKeys(unref(treeData));
               await nextTick();
-              treeRef.value.setCheckedKeys(roleMenus.value);
+              unref(treeRef)?.setCheckedKeys(roleMenus.value);
               setFieldsValue(data.record);
             } else {
             }
@@ -150,13 +147,14 @@
         setDrawerProps({ confirmLoading: true });
         const { createMessage } = useMessage();
         try {
+          const menu = (unref(treeRef)?.getCheckedKeys() as string[]) || [];
           const values = await validate();
           const req = {
             id: roleId.value,
             name: values.name,
             remark: values.remark,
             status: values.status,
-            menu: unref(allCheckedKeys) || [],
+            menu,
           };
           if (req.menu == undefined) return createMessage.error('请勾选权限菜单');
           saveOrUpdateRoleInfoWithMenu(req).then(() => {
@@ -170,10 +168,6 @@
           }, 300);
         }
       }
-      // Tree check事件
-      const handleCheckClick = (checkedNodes, { halfCheckedKeys }) => {
-        allCheckedKeys.value = [...checkedNodes, ...halfCheckedKeys];
-      };
       const getPermissionByRole = async (roleType: RoleEnum) => {
         try {
@@ -254,8 +248,6 @@
         treeData,
         roleMenus,
         treeRef,
-        handleCheckClick,
-        allCheckedKeys,
       };
     },
   });
--- a/src/views/tenant/role/RoleDrawer.vue
View file @c71159a
+++ b/src/views/tenant/role/RoleDrawer.vue
View file @c71159a
@@ -15,7 +15,6 @@
             :treeData="treeData"
             :replaceFields="{ title: 'name', key: 'id' }"
             :checkedKeys="roleMenus"
-            @check="handleCheckClick"
             checkable
             toolbar
             ref="treeRef"
@@ -31,7 +30,7 @@
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { formSchema } from './role.data';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  import { BasicTree, TreeItem } from '/@/components/Tree';
+  import { BasicTree, TreeActionType, TreeItem } from '/@/components/Tree';
   const { t } = useI18n(); //加载国际化
   // 加载菜单数据
   import { getAdminMenuList, getMenuList, getMenusIdsByRoleId } from '/@/api/sys/menu';
@@ -55,9 +54,8 @@
       const isUpdate = ref(true);
       const treeData = ref<TreeData[]>([]);
       const roleMenus = ref<string[]>([]);
-      const allCheckedKeys = ref<string[]>([]);
       const roleId = ref('');
-      const treeRef = ref();
+      const treeRef = ref<Nullable<TreeActionType>>(null);
       const checked = ref<string[]>([]); //需要选中的节点
       const spinning = ref(false);
@@ -79,7 +77,6 @@
       const { isPlatformAdmin } = useRole();
       const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-        allCheckedKeys.value = [];
         resetFields();
         roleId.value = '';
         // 在打开弹窗时清除所有选择的菜单
@@ -111,11 +108,11 @@
             roleId.value = data.record.id;
             //通过角色id去获取角色对应的菜单的ids
-            allCheckedKeys.value = roleMenus.value = await getMenusIdsByRoleId(data.record.id);
+            roleMenus.value = await getMenusIdsByRoleId(data.record.id);
             excludeHalfCheckedKeys(unref(treeData));
             await nextTick();
-            treeRef.value.setCheckedKeys(roleMenus.value);
+            treeRef.value?.setCheckedKeys(roleMenus.value);
             setFieldsValue(data.record);
           } else {
           }
@@ -131,6 +128,7 @@
         setDrawerProps({ loading: true });
         setDrawerProps({ confirmLoading: true });
         const { createMessage } = useMessage();
+        const menu = (unref(treeRef)?.getCheckedKeys() as string[]) || [];
         try {
           const values = await validate();
           const req = {
@@ -139,7 +137,7 @@
             remark: values.remark,
             status: values.status,
             roleType: RoleEnum.TENANT_ADMIN,
-            menu: unref(allCheckedKeys) || [],
+            menu,
           };
           if (req.menu == undefined) return createMessage.error('请勾选权限菜单');
           const res = await saveOrUpdateRoleInfoWithMenu(req);
@@ -157,10 +155,6 @@
           }, 300);
         }
       }
-      // Tree check事件
-      const handleCheckClick = (checkedNodes, { halfCheckedKeys }) => {
-        allCheckedKeys.value = [...checkedNodes, ...halfCheckedKeys];
-      };
       const getPermissionByRole = async (roleType: RoleEnum) => {
         try {
@@ -241,7 +235,6 @@
         treeData,
         roleMenus,
         treeRef,
-        handleCheckClick,
       };
     },
   });