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

package/package.json

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

package/src/App.vue

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

package/src/components/apply-modal.vue

@@ -69,6 +69,10 @@ import SuccessModal from './success-modal.vue';
 import ApprovalSteps from './approval-steps.vue';
 import t, {throttle, deepTree} from '../utils';
 import useCategory from '../hooks/useCategory';
+import useDefaultTime from '../hooks/useDefaultTime';
+
+const OWNER_STATUS = 'OWNER';
+const MAX_COUNT = 5;
 
 const CategorySelector = defineAsyncComponent(() =>
 	import('./category-selector.vue')
@@ -155,7 +159,6 @@ const getParams = () => {
 		};
 		
 	});
-
 	deepTree(permissionList.value, (item: any) => {
 		if (!item.children && formState.features.includes(item.feature)) {
 			roleVoList.push({
@@ -180,6 +183,7 @@ const setDefaultTime = (permission: PermissionType) => {
 
 const onChangeTime = throttle(async () => {
 	const params = getParams();
+
 	if (params.roleVoList.length === 0) {
 		stepNodes.value = [];
 		return;
@@ -199,33 +203,40 @@ const onCheck = (checkedIds:any, info:any) => {
 		if (!item.children && formState.features.includes(item.feature)) {
 			curTotal += 1;
 		}
+		if (!item.children && !formState.features.includes(item.feature)) {
+			// 新选择的节点，设置默认时间
+			item.validTime = useDefaultTime(item, OWNER_STATUS);
+		}
 	})
 
-	if (curTotal === 5) {
-		message.warning(t('maxCountTips', {count: 5}));
+	if (curTotal > MAX_COUNT) {
+		message.warning(t('maxCountTips', { count: MAX_COUNT }));
 		return;
 	}
-	onChangeTime();
-	if (!info.node.children && total > 5) {
+	if (!info.node.children && total > MAX_COUNT) {
 		//选择的是子节点
 		formState.features = formState.features.filter((item) => item !== info.node.feature);
-		message.warning(t('maxCountTips', {count: 5}));
+		message.warning(t('maxCountTips', { count: MAX_COUNT }));
+		onChangeTime();
+
 		return;
 	}
 
-	if (info.node.children && total > 5) {
+	if (info.node.children && total > MAX_COUNT) {
 		//选择的是父节点，则找出刚选的所有叶子节点， 并且删除其中多余(total-5)的节点
-		const diff = total - 5;
+		const diff = total - MAX_COUNT;
 		let leafNodes:string[] = [];
 		deepTree([info.node], (item: any) => {
-			if (!item.children && !formState.features.includes(item.feature)) {
+			if (!item.children && !item.disabled && !formState.features.includes(item.feature)) {
 				leafNodes.push(item.feature);
 			}
 		})
 		// 从后面删除多余的节点
 		leafNodes = leafNodes.slice(0, leafNodes.length - diff);
 		formState.features = formState.features.concat(leafNodes);
-		message.warning(t('maxCountTips', {count: 5}));
+		message.warning(t('maxCountTips', { count: MAX_COUNT }));
+		onChangeTime();
+
 		return;
 	};
 
@@ -233,7 +244,6 @@ 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

@@ -19,7 +19,7 @@
                     </template>
                 </TreeSelect>
                 <span v-if="item.attributeValueIds_view?.includes(-1)" style="color: #ff4d4f; font-size: 12px;">
-                    {{ t('categoryChangeTips') }}
+                    {{ t('categoryChangeTips', { category: item.categoryName }) }}
                 </span>
             </FormItem>
         </template>

package/src/components/permission-item.vue

@@ -69,7 +69,7 @@
 		<!-- 选择框 -->
 		<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"
+			<Select v-model:value="item.validTime" style="width: 100px"
 				:disabled="item.businessApplyType === OWNER_STATUS"
 				:options="item.businessApplyType === OWNER_STATUS ? validTimeOptions : tempTimeOptions"
 				@change="onChangeTimeHandler" size="small">
@@ -79,7 +79,7 @@
 	</div>
 </template>
 <script lang="ts" setup>
-import { PropType, ref, watch, defineEmits, computed } from 'vue';
+import { PropType, defineEmits, computed } from 'vue';
 import { Tag, Popover, Select } from 'ant-design-vue';
 import { QuestionCircleOutlined } from '@ant-design/icons-vue';
 import departmentImg from '@/assets/department.png';
@@ -125,7 +125,6 @@ let props = defineProps({
 });
 
 const statusMap = t('status');
-const validTime = ref('');
 
 const tempTimeOptions = computed(() => {
 	return props.validTimeOptions.filter((item: any) => {
@@ -134,39 +133,11 @@ const tempTimeOptions = computed(() => {
 });
 
 
-//1登录人所在部门 = 权限适用范围，都默认90天，不需要区分等级和类型，
-//2登录人所在部门 ≠ 权限适用范围，根据等级来，高（L3）默认给7天，中（L2）默认给30天，低（L1）默认给60天
-const setDefaultTime = (item: PermissionType) => {
-	if (item.businessApplyType === OWNER_STATUS) {
-		return item.virtualOwnState?.timeStatus
-	}
-	const validMap = {
-		L1: 'SIXTY_DAYS',
-		L2: 'THIRTY_DAYS',
-		L3: 'SEVEN_DAYS',
-	};
-	const { relatedDepartmentIds = [], curDepartmentId = 0, securityLevel } = item;
-	if (relatedDepartmentIds?.includes(curDepartmentId as number)) {
-			item.validTime = 'NINETY_DAYS';
-		} else {
-			item.validTime = validMap[securityLevel];
-		}
-	return item.validTime;
-};
-
 const getCategoryValue = (category: CategoryType) => {
 	return `【${category.categoryName}】：${category.attributeValues?.map((item: any) => item.attributeName)?.join('、') || t('empty')}`;
 };
-
-watch(() => props.checkedKeys, (newVal, oldVal) => {
-	if ((oldVal && !oldVal.includes(props.item.feature)) && newVal.includes(props.item.feature)) {
-		validTime.value = setDefaultTime(props.item);
-		props.item.validTime = setDefaultTime(props.item);
-		emit('updateTime', props.item);
-}}, { immediate: true });
 	
-const onChangeTimeHandler = (value:any) => {
-	props.item.validTime = value;
+const onChangeTimeHandler = () => {
 	emit('updateTime', props.item);
 	emit('onChangeTime', props.item);
 };

package/src/components/yqg-permission.vue

@@ -187,7 +187,7 @@ import useFormat from '../hooks/useFormat';
   	watch(() => props.locale, (cur, pre) => {
 		if (cur === pre) return;
 		localStorage.setItem('permission_locale', props.locale);
-  	}, {immediate: true})
+  	}, {immediate: true});
 </script>
 
 <style scoped>

package/src/hooks/useDefaultTime.ts

@@ -0,0 +1,20 @@
+
+//1登录人所在部门 = 权限适用范围，都默认90天，不需要区分等级和类型，
+//2登录人所在部门 ≠ 权限适用范围，根据等级来，高（L3）默认给7天，中（L2）默认给30天，低（L1）默认给60天
+export default function useDefaultTime (item: PermissionType, status:string):string  {
+    if (item.businessApplyType === status) {
+        return item.virtualOwnState?.timeStatus
+    }
+    const validMap = {
+        L1: 'SIXTY_DAYS',
+        L2: 'THIRTY_DAYS',
+        L3: 'SEVEN_DAYS',
+    };
+    const { relatedDepartmentIds = [], curDepartmentId = 0, securityLevel } = item;
+    if (relatedDepartmentIds?.includes(curDepartmentId as number)) {
+        item.validTime = 'NINETY_DAYS';
+    } else {
+        item.validTime = validMap[securityLevel];
+    }
+    return item.validTime;
+};

package/src/i18n/zh-CH.ts

@@ -36,8 +36,8 @@ export default {
     categoryTips: '当前您所拥有的数据范围如下：',
     empty: '空',
     category: '数据权限',
-    categotySelectTips: '上方选中的权限包含数据权限，请根据实际工作需要申请/更改数据范围',
-    categoryChangeTips: '提醒：您选择的数据权限范围较大！请确认实际工作场景是否需要全量「部门」权限，并在申请理由中写明，避免审批不通过！',
+    categotySelectTips: '上方选中的权限包含数据权限，请根据实际工作需要申请/更改数据范围。',
+    categoryChangeTips: '提醒：您选择的数据权限范围较大！请确认实际工作场景是否需要全量「{category}」权限，并在申请理由中写明，避免审批不通过！',
     availiables: {
         SEVEN_DAYS: '7天',
         THIRTY_DAYS: '30天',

package/src/utils/index.ts

@@ -4,8 +4,8 @@ type optionsType = {
     [key: string]: any;
 };
 const t = (key: string, options?: optionsType) => {
-    // key的格式为：'xxx.xxx.xxx'
-    const en = localStorage.getItem('permission_locale') || 'en-US';
+    // key的格式为：'xxx.xxx.xxx'//国际化todo
+	const en = localStorage.getItem('permission_locale') || 'zh-CN';
     const keys = key.split('.');
     let result = language[en as string] || language['en-US'];
     for (let i = 0; i < keys.length; i++) {

package/tsconfig.app.json

@@ -25,8 +25,9 @@
 		"src/**/*.ts",
 		"src/**/*.d.ts",
 		"src/**/*.tsx",
-		"src/**/*.vue"
-	 ],
+		"src/**/*.vue", 
+        "src/i18n/zh-CH.js"	
+    ],
 	"exclude": [
 	    "node_modules",
 	    "vite.config.ts"  // 如果不需要解析 vite.config.ts