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

package/package.json

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

package/src/App.vue

@@ -9,13 +9,11 @@ const color = ref<string>('#1677ff');
 const locale = ref<LocaleType>('zh-CN');
 
 const permissions = reactive([
-	'CRANE.PERMISSION.QUERY',
-	'CRANE.PERMISSION.CREATE',
-	'CRANE.PERMISSION.UPDATE',
-	'CRANE.PERMISSION.DELETE',
-	'CRANE.PERMISSION.DETAIL_QUERY',
-	'CRANE.PERMISSION.ROLE_ASSIGN',
-	'CRANE.PERMISSION.EXPORT',
+	'CRANE.EMPLOYEE.QUERY',
+	'CRANE.EMPLOYEE.DETAIL_QUERY',
+	'CRANE.EMPLOYEE.ATTRIBUTE_CREATE',
+	'CRANE.EMPLOYEE.ROLE_ASSIGN',
+	'CRANE.EMPLOYEE.DEPARTMENT_ROLE.ATTRIBUTE_ROLE_CREATE',
 ]);
 // const permissions = reactive(['CRANE.BUSINESS.QUERY', 'RANE.BUSINESS.CREATE', 'CRANE.BUSINESS.UPDATE', 'CRANE.BUSINESS.DELETE']);
 const changeColor = () => {
@@ -39,7 +37,7 @@ const changeLocale = () => {
 			  <!-- 05184 -->
 			<yqg-permission
 			:permissions="permissions"
-			workNumber="05184"
+			workNumber="04701"
 			:color="color"
 			:locale="locale"
 			@onSuccess="() => {console.log('成功')}"

package/src/components/apply-modal.vue

@@ -9,8 +9,8 @@
 						{{t('noPermissionTips')}}
 					</span>
 
-					<Tree checkable :default-expand-all="true" :tree-data="permissionList" :height="200"
-						:checkedKeys="formState.features" class="crane-permission-tree" @check="onCheck">
+					<Tree checkable :default-expand-all="true" :tree-data="permissionList" :height="200" :expandedKeys="expandedKeys"
+						:checkedKeys="formState.features" class="crane-permission-tree" @check="onCheck" @expand="expandedKeys = $event">
 						<template #title="item: PermissionType">
 							<div v-if="item.children && item.children.length">
 								{{ item.shortName }}
@@ -107,6 +107,7 @@ const categoryRef = ref();
 let stepNodes = ref([]);
 const categoryList = ref<CategoryType[]>([]);
 const validTimeOptions = ref([]);
+const expandedKeys = ref<any[]>([]);
 const formState = reactive<formStateType>({
 	features: [],
 	roleVoList: [],
@@ -236,6 +237,15 @@ const onCheck = (checkedIds:any, info:any) => {
 	// 预览审批流程
 }
 
+watch(() => props.permissionList, (cur) => {
+	expandedKeys.value = [];
+	deepTree(cur, (item: any) => {
+		if (item.children && item.children.length) {
+			expandedKeys.value.push(item.feature);
+		}
+	})
+})
+
 watch(() => open.value, (cur) => {
 	if (cur) {
 		formRef.value?.resetFields();

package/src/components/permission-item.vue

@@ -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/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/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);