@yqg/permission 1.3.0-alpha.0 → 1.3.0-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@yqg/permission",
-    "version": "1.3.0-alpha.0",
+    "version": "1.3.0-alpha.1",
     "main": "dist/index.js",
     "module": "dist/index.js",
     "type": "module",

package/src/hooks/useCategory.ts

@@ -5,7 +5,6 @@ export default function useCategory(tree: PermissionType[], checkedIds: string[]
     const categoryList: CategoryType[] = [];
     deepTree(tree, (item) => {
         if (!item.children && checkedIds.includes(item.feature)) {
-
             item.categoryVOS.forEach((category: any) => {
                 category.attributeValueIds_view = category?.attributeValueIds || [];  
                 categoryList.push(category);

package/src/hooks/useFormat.ts

@@ -9,18 +9,15 @@ const StatusType = {
     TEMP_OWNER: 'TEMP_OWNER'
 }
 export default function useFormat(tree: PermissionListType) {
-    function sortTree(tree: PermissionListType, sortMap: Map<string | null, number>, levelSortMap: Map<string | null, number>) {
-        // 对当前层的节点进行排序
-        tree.sort((a, b) => {
-            return (sortMap.get(a.businessApplyType) ?? 0) - (sortMap.get(b.businessApplyType) ?? 0)
-                || (levelSortMap.get(a.securityLevel) ?? 0) - (levelSortMap.get(b.securityLevel) ?? 0);
-        });
-
-        // 递归对每个节点的子节点进行排序
-        tree.forEach(node => {
+    function sortTree(
+        tree: PermissionListType,
+        sortMap: Map<string | null, number>,
+        levelSortMap: Map<string | null, number>
+    ) {
+        return tree.map((node) => {
             node.key = node.feature;
-            node.desc = 'ddddd'
-            if (!node.children) {
+
+            if (!node.children || node.children.length === 0) {
                 node.categoryVOS = (node.categoryVOS || []).filter((item: any) => item.configWay !== Category.AUTO);
 
                 if ([StatusType.NO].includes(node.businessApplyType)) {
@@ -30,21 +27,30 @@ export default function useFormat(tree: PermissionListType) {
                 if ([StatusType.OWNER, StatusType.PENDING].includes(node.businessApplyType) && !node.categoryVOS.length) {
                     node.disabled = true;
                 }
+            } else {
+                // 递归对子节点进行排序
+                node.children = sortTree(node.children, sortMap, levelSortMap);
+
+                // 检查所有子节点是否 `disabled === true`
+                if (node.children.every((child) => child.disabled)) {
+                    node.disabled = true;
+                }
             }
-            if (node.children && node.children.length > 0) {
-                sortTree(node.children, sortMap, levelSortMap);
-            }
-        });
 
-        return tree;
+            return node;
+        }).sort((a, b) => {
+            return (sortMap.get(a.businessApplyType) ?? 0) - (sortMap.get(b.businessApplyType) ?? 0)
+                || (levelSortMap.get(a.securityLevel) ?? 0) - (levelSortMap.get(b.securityLevel) ?? 0);
+        });
     }
 
     // 需要排序，规则：businessApplyType 为 null 在前面， PENDING. OWNER 在中间， NO 在后面
     // 然后再根据 L1, L2, L3 排序
     const sort = [null, StatusType.TEMP_OWNER, StatusType.PENDING, StatusType.OWNER, StatusType.NO];
-    const levelSort = [null, 'L1', 'L2', 'L3'];
+    const levelSort = [null, "L1", "L2", "L3"];
     const sortMap = new Map(sort.map((value, index) => [value, index]));
     const levelSortMap = new Map(levelSort.map((value, index) => [value, index]));
 
     return sortTree(tree, sortMap, levelSortMap);
-};
+}
+