Merge branch 'fix/DEFECT-1387' into 'main_dev'

fix: 修复角色创建菜单勾选全部无效

See merge request yunteng/thingskit-front!690

@@ -51,14 +51,6 @@
       'update:searchValue',
       'update:searchValue',
     ],
     ],
     setup(props, { attrs, slots, emit, expose }) {
     setup(props, { attrs, slots, emit, expose }) {
-      // /**
-      //  * 作者自带Tree组件
-      //  * 新增显示隐藏
-      //  * ft
-      //  */
-      // //ft
-      // const isFlod = ref(false);
-      //ft
       const state = reactive<State>({
       const state = reactive<State>({
         checkStrictly: props.checkStrictly,
         checkStrictly: props.checkStrictly,
         expandedKeys: props.expandedKeys || [],
         expandedKeys: props.expandedKeys || [],

@@ -152,12 +152,14 @@
         const { createMessage } = useMessage();
         const { createMessage } = useMessage();
         try {
         try {
           const values = await validate();
           const values = await validate();
+          const treeCheckedKeys: string[] = (unref(treeRef)?.getCheckedKeys() as string[]) || [];
+          const menu = [...new Set([...unref(checkedKeysWithHalfChecked), ...treeCheckedKeys])];
           const req = {
           const req = {
             id: roleId.value,
             id: roleId.value,
             name: values.name,
             name: values.name,
             remark: values.remark,
             remark: values.remark,
             status: values.status,
             status: values.status,
-            menu: unref(checkedKeysWithHalfChecked),
+            menu,
           };
           };
           if (req.menu == undefined) return createMessage.error('请勾选权限菜单');
           if (req.menu == undefined) return createMessage.error('请勾选权限菜单');
           saveOrUpdateRoleInfoWithMenu(req).then(() => {
           saveOrUpdateRoleInfoWithMenu(req).then(() => {

@@ -131,6 +131,8 @@
       async function handleSubmit() {
       async function handleSubmit() {
         setDrawerProps({ loading: true, confirmLoading: true });
         setDrawerProps({ loading: true, confirmLoading: true });
         const { createMessage } = useMessage();
         const { createMessage } = useMessage();
+        const treeCheckedKeys: string[] = (unref(treeRef)?.getCheckedKeys() as string[]) || [];
+        const menu = [...new Set([...unref(checkedKeysWithHalfChecked), ...treeCheckedKeys])];
         try {
         try {
           const values = await validate();
           const values = await validate();
           const req = {
           const req = {
@@ -139,7 +141,7 @@
             remark: values.remark,
             remark: values.remark,
             status: values.status,
             status: values.status,
             roleType: RoleEnum.TENANT_ADMIN,
             roleType: RoleEnum.TENANT_ADMIN,
-            menu: unref(checkedKeysWithHalfChecked),
+            menu,
           };
           };
           if (req.menu == undefined) return createMessage.error('请勾选权限菜单');
           if (req.menu == undefined) return createMessage.error('请勾选权限菜单');
           const res = await saveOrUpdateRoleInfoWithMenu(req);
           const res = await saveOrUpdateRoleInfoWithMenu(req);