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

package/package.json

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

package/src/App.vue

@@ -9,13 +9,13 @@ const color = ref<string>('#1677ff');
 const locale = ref<LocaleType>('zh-CN');
 
 const permissions = reactive([
-	'test222.testlyt2',
-	'test222.testplyt',
-	'test222.tstplyt3',
-	'test222.tstplyt4',
-	'test222.tstplyt5',
-	'test222.wjkwd13',
-	'test222.YEWEITEST.query01',
+	'CRANE.PERMISSION.QUERY',
+	'CRANE.PERMISSION.CREATE',
+	'CRANE.PERMISSION.UPDATE',
+	'CRANE.PERMISSION.DELETE',
+	'CRANE.PERMISSION.DETAIL_QUERY',
+	'CRANE.PERMISSION.ROLE_ASSIGN',
+	'CRANE.PERMISSION.EXPORT',
 ]);
 // const permissions = reactive(['CRANE.BUSINESS.QUERY', 'RANE.BUSINESS.CREATE', 'CRANE.BUSINESS.UPDATE', 'CRANE.BUSINESS.DELETE']);
 const changeColor = () => {

package/src/components/apply-modal.vue

@@ -9,7 +9,7 @@
 						{{t('noPermissionTips')}}
 					</span>
 
-					<Tree checkable :defaultExpandAll="true" :tree-data="permissionList" :height="200"
+					<Tree checkable :default-expand-all="true" :tree-data="permissionList" :height="200"
 						:checkedKeys="formState.features" class="crane-permission-tree" @check="onCheck">
 						<template #title="item: PermissionType">
 							<div v-if="item.children && item.children.length">
@@ -232,7 +232,7 @@ const onCheck = (checkedIds:any, info:any) => {
 
 	// 收集需要展示的数据属性
 	categoryList.value = useCategory(permissionList.value, formState.features);
-
+	console.log(categoryList.value, formState.features);
 	// 预览审批流程
 }
 

package/src/components/category-selector.vue

@@ -55,7 +55,7 @@ const showForm = computed(() => {
 });
 const formRef = ref();
 const searchValue = ref('');
-const { categoryValuesMap } = useAttributesCache(props.categoryList);
+const { categoryValuesMap } = useAttributesCache(props);
 
 // 返回promise
 const validate = () => {

package/src/components/permission-item.vue

@@ -62,7 +62,7 @@
 				any) => {
 				return item.categoryName;
 				}).join('、')
-				}}325kjfhkjdhfkdshfkjdshglkjshdfgkjkjdhfkdshfkjdshglkjshdfgkjkjdhfkdshfkjdshglkjshdfgkjkjdhfkdshfkjdshglkjshdfgkjsfd
+				}}
 			</div>
 		</Popover>
 

package/src/components/yqg-permission.vue

@@ -167,9 +167,8 @@ import useFormat from '../hooks/useFormat';
 			workNumber,
 			features: permissions.toString(),
 		};
-		
-		loading.value = true;
 
+		loading.value = true;
 		const res = await Http.getPermissions(params);
 		permissionList.value = useFormat(res.body || []);
 		curStatus.value = useStatus(permissionList.value, curApproving);
@@ -177,8 +176,8 @@ import useFormat from '../hooks/useFormat';
   	};
 
   	const showModal = () => {
-		getPermissions();
 		open.value = !open.value;
+		getPermissions();
   	};
 
 	const { currentTop, dragElement } = useDraggable(props, showModal);

package/src/hooks/useAttributesCache.ts

@@ -2,10 +2,10 @@ import { watch, reactive } from 'vue';
 import Http from '../axios/index';
 
 const categoryValuesMap = reactive<Record<number, []>>({});
-export default function useAttributesCache(categoryList: CategoryType[]) {
+export default function useAttributesCache(props: any) {
 
-    watch(() => categoryList, (newVal) => {
-        newVal.forEach(async (item) => {
+    watch(() => props.categoryList, (newVal) => {
+        newVal.forEach(async (item:CategoryType) => {
             if (!categoryValuesMap[item.id]) {
                 const res = await Http.getCategoryValues(item.id);
                 const { flatAttributeValue, treeAttributeValue, showWay } = res.body;
@@ -13,7 +13,7 @@ export default function useAttributesCache(categoryList: CategoryType[]) {
             }
         });
 
-    }, { immediate: true });
+    }, { immediate: true, deep: true });
 
     return {
         categoryValuesMap

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);
-};
+}
+

package/src/main.ts

@@ -1,8 +1,8 @@
 import { createApp } from 'vue';
 import App from './App.vue';
 import './style.css';
-import yqgPermission from './yqg-permission';
-// import yqgPermission from '../dist';
+// import yqgPermission from './yqg-permission';
+import yqgPermission from '../dist';
 yqgPermission.init();
 
 const app = createApp(App);

package/src/yqg-permission/index.ts

@@ -36,7 +36,6 @@ class YqgPermission implements YqgPermissionType {
             return;
         }
         if (this.hasInit) {
-            console.warn('yqg-permission has already been initialized');
             return;
         }