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

package/package.json

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

package/src/App.vue

@@ -9,13 +9,7 @@ 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',
+	'yewei0313.REAQS22.DEPAWED_ANQ22.QUERY22',
 ]);
 // 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>
 
@@ -70,8 +70,8 @@
 		<span v-if="checkedKeys.includes(item.feature)" class="crane-weak-color crane-margin-left-12">
 			{{ t('availableTime') }}：
 			<Select v-model:value="validTime" style="width: 100px"
-				:disabled="DISABLED_STATUS.includes(item.businessApplyType)"
-				:options="DISABLED_STATUS.includes(item.businessApplyType) ? validTimeOptions : tempTimeOptions"
+				:disabled="item.businessApplyType === OWNER_STATUS"
+				:options="item.businessApplyType === OWNER_STATUS ? validTimeOptions : tempTimeOptions"
 				@change="onChangeTimeHandler" size="small">
 			</Select>
 		</span>
@@ -87,8 +87,6 @@ import categoryImg from '@/assets/category.png';
 import t from '../utils';
 
 const OWNER_STATUS = 'OWNER';
-const PENDING_STATUS = 'PENDING';
-const DISABLED_STATUS = [OWNER_STATUS, PENDING_STATUS];
 
 const levelMap:LevelMapType = {
 	L1: {
@@ -139,12 +137,9 @@ const tempTimeOptions = computed(() => {
 //1登录人所在部门 = 权限适用范围，都默认90天，不需要区分等级和类型，
 //2登录人所在部门 ≠ 权限适用范围，根据等级来，高（L3）默认给7天，中（L2）默认给30天，低（L1）默认给60天
 const setDefaultTime = (item: PermissionType) => {
-	if (OWNER_STATUS.includes(item.businessApplyType)) {
+	if (item.businessApplyType === OWNER_STATUS) {
 		return item.virtualOwnState?.timeStatus
 	}
-	if (PENDING_STATUS.includes(item.businessApplyType)) {
-		return item.pendingValidTime
-	}
 	const validMap = {
 		L1: 'SIXTY_DAYS',
 		L2: 'THIRTY_DAYS',

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/useFormat.ts

@@ -20,11 +20,11 @@ export default function useFormat(tree: PermissionListType) {
             if (!node.children || node.children.length === 0) {
                 node.categoryVOS = (node.categoryVOS || []).filter((item: any) => item.configWay !== Category.AUTO);
 
-                if ([StatusType.NO].includes(node.businessApplyType)) {
+                if ([StatusType.NO, StatusType.PENDING].includes(node.businessApplyType)) {
                     node.disabled = true;
                 }
 
-                if ([StatusType.OWNER, StatusType.PENDING].includes(node.businessApplyType) && !node.categoryVOS.length) {
+                if ([StatusType.OWNER].includes(node.businessApplyType) && !node.categoryVOS.length) {
                     node.disabled = true;
                 }
             } else {

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