Merge branch 'dev-ft' into 'main'

fix:修复菜单管理下的角色管理，修复逐户下面的角色管理，按钮级别回显问题

See merge request huang/yun-teng-iot-front!209

@@ -26,7 +26,7 @@
   </BasicDrawer>
 </template>
 <script lang="ts">
-  import { defineComponent, ref, computed, unref } from 'vue';
+  import { defineComponent, ref, computed, unref, nextTick } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { formSchema } from './role.data';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
@@ -49,6 +49,9 @@
       const allCheckedKeys = ref<string[]>([]);
       const roleId = ref<string>('');
       const treeRef = ref();
+      const checked: any = ref([]); //需要选中的节点
+      const pidArr: any = ref([]); //获取父节点
+
       const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
         labelWidth: 100,
         schemas: formSchema,
@@ -66,16 +69,6 @@
           }
         });
       }
-
-      /**
-       * 根据角色id获取所有的菜单ids----里面包含父级id---会造成回显数据时
-       * 存在父级id则默认勾选所有子级id
-       */
-      function useChildrenIdsRemoveParentId(str, arr) {
-        let index = arr.indexOf(str);
-        arr.splice(index, 1);
-        return arr;
-      }
       const originMenus = ref();
       const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
         resetFields();
@@ -92,19 +85,25 @@
         }
         // 更新
         if (unref(isUpdate)) {
+          checked.value = [];
           //通过角色id去获取角色对应的菜单的ids
           roleMenus.value = await getMenusIdsByRoleId(data.record.id);
           originMenus.value = [...roleMenus.value];
-
-          for (let m of treeData.value) {
-            console.log(m);
-            for (let m1 of roleMenus.value) {
-              // 利用continue特性优化一下性能
-              if (!(m.key === m1 && m.children.length)) continue;
-              useChildrenIdsRemoveParentId(m1, roleMenus.value);
+          for (let item of treeData.value) {
+            pidArr.value.push(item.key);
+            for (let item1 of item?.children) {
+              pidArr.value.push(item1.key);
             }
           }
-          treeRef.value.setCheckedKeys(roleMenus.value);
+          for (let item of roleMenus.value) {
+            let isP = pidArr.value.includes(item);
+            if (!isP) {
+              checked.value.push(item);
+            }
+          }
+          nextTick(() => {
+            treeRef.value.setCheckedKeys(checked.value);
+          });
           roleId.value = data.record.id;
           setFieldsValue(data.record);
         }

@@ -51,6 +51,9 @@
       const allCheckedKeys = ref<string[]>([]);
       const roleId = ref('');
       const treeRef = ref();
+      const checked: any = ref([]); //需要选中的节点
+      const pidArr: any = ref([]); //获取父节点
+
       const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
         labelWidth: 90,
         schemas: formSchema,
@@ -68,15 +71,6 @@
         });
       }
 
-      /**
-       * 根据角色id获取所有的菜单ids----里面包含父级id---会造成回显数据时
-       * 存在父级id则默认勾选所有子级id
-       */
-      function useChildrenIdsRemoveParentId(str, arr) {
-        let index = arr.indexOf(str);
-        arr.splice(index, 1);
-        return arr;
-      }
       const originMenus = ref();
       const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
         setDrawerProps({ confirmLoading: false });
@@ -94,29 +88,24 @@
         }
         // 更新
         if (unref(isUpdate)) {
+          checked.value = [];
           //通过角色id去获取角色对应的菜单的ids
           roleMenus.value = await getMenusIdsByRoleId(data.record.id);
           originMenus.value = [...roleMenus.value];
-          console.log('Query role ids', roleMenus.value);
-          console.log('TreeData ids', treeData.value);
-          for (let m of treeData.value) {
-            console.log('m', m);
-            for (let m1 of roleMenus.value) {
-              if (m?.key != m1 && m?.children.length == 0) {
-                useChildrenIdsRemoveParentId(m1, roleMenus.value);
-              }
+          for (let item of treeData.value) {
+            pidArr.value.push(item.key);
+            for (let item1 of item?.children) {
+              pidArr.value.push(item1.key);
+            }
+          }
+          for (let item of roleMenus.value) {
+            let isP = pidArr.value.includes(item);
+            if (!isP) {
+              checked.value.push(item);
             }
           }
-          // for (let m of treeData.value) {
-          //   for (let m1 of roleMenus.value) {
-          //     if (m.key != m1 && m?.children.length == 0) {
-          //       useChildrenIdsRemoveParentId(m1, roleMenus.value);
-          //     }
-          //   }
-          // }
           nextTick(() => {
-            console.log('Finally data', roleMenus.value);
-            treeRef.value.setCheckedKeys(roleMenus.value);
+            treeRef.value.setCheckedKeys(checked.value);
           });
           roleId.value = data.record.id;
           setFieldsValue(data.record);
@@ -154,7 +143,6 @@
       };
 
       return {
-        useChildrenIdsRemoveParentId,
         registerDrawer,
         registerForm,
         getTitle,