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

package/package.json

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

package/src/App.vue

@@ -9,12 +9,7 @@ const color = ref<string>('#1677ff');
 const locale = ref<LocaleType>('zh-CN');
 
 const permissions = reactive([
-	'CRANE.PERMISSION.QUERY',
-	'CRANE.EMPLOYEE.QUERY',
-	'CRANE.EMPLOYEE.DETAIL_QUERY',
-	'CRANE.EMPLOYEE.ATTRIBUTE_CREATE',
-	'CRANE.EMPLOYEE.ROLE_ASSIGN',
-	'CRANE.EMPLOYEE.DEPARTMENT_ROLE.ATTRIBUTE_ROLE_CREATE',
+	'yewei0313.REAQS.DEPAWED_ANQ2.QUERY',
 ]);
 // const permissions = reactive(['CRANE.BUSINESS.QUERY', 'RANE.BUSINESS.CREATE', 'CRANE.BUSINESS.UPDATE', 'CRANE.BUSINESS.DELETE']);
 const changeColor = () => {
@@ -36,7 +31,7 @@ const changeLocale = () => {
 			<!-- 03541 -->
 			<!-- 02124 -->
 			<!-- 05184 -->
-			<yqg-permission :permissions="permissions" workNumber="04697" :color="color" :locale="locale"
+			<yqg-permission :permissions="permissions" workNumber="03817" :color="color" :locale="locale"
 				@onSuccess="() => {console.log('成功')}">
 			</yqg-permission>
 		</div>

package/src/axios/index.ts

@@ -9,7 +9,7 @@ type apiType = {
 export default {
     getPermissions: (params: any) => axios.get(`${urlPrefix}/permission/apply`, {params}),
 
-	getFlowPreview: (params: any)=> axios.post(`${urlPrefix}/permission/apply/oa/flow/submit/preview`, params),
+	getFlowPreview: (params: any) => axios.post(`${urlPrefix}/permission/apply/oa/flow/submit/preview`, params),
 
 	submitApply: (params: any) => axios.post(`${urlPrefix}/permission/apply/oa/flow/submit`, params),
 

package/src/components/apply-modal.vue

@@ -1,6 +1,13 @@
 <template>
-	<Modal v-model:open="open" :title="t('permissionApply')" width="1100px" @ok="handleOk" :okText="t('submit')"
-		:maskClosable="false" :ok-button-props="{ loading: loading }" :cancelText="t('cancel')">
+	<Modal v-model:open="open" width="1100px" :maskClosable="false">
+		<template #footer>
+			<Button @click="open = false" v-show="!isAllChecked && permissionList.length">{{ t('cancel') }}</Button>
+			<Button type="primary" @click="handleOk" :loading="loading">{{ t('submit') }}</Button>
+		</template>
+		<template #title>
+			<span>{{ t('permissionApply') }}</span>
+			<span v-show="isAllChecked && permissionList.length" class="crane-permission-title-tips">{{ t('isAllOwnTips') }}</span>
+		</template>
 		<Form ref="formRef" :model="formState" :labelCol="{ span: 4 }" :wrapperCol="{ span: 19 }">
 			<FormItem :label="t('applyPermission')" name="features"
 				:rules="[{ required: true, message: t('selectPlaceholder') }]">
@@ -30,8 +37,8 @@
 				max: 300, message: t('maxLengthTips', { length: 300 }), trigger: ['change', 'blur']
 			}]">
 				<Textarea v-model:value.trim="formState.applyReason" :placeholder="t('applyReasonPlaceholder')"
-					:auto-size="{ minRows: 4, maxRows: 4 }">
-	</Textarea>
+					:auto-size="{ minRows: 4, maxRows: 4 }" :disabled="isAllChecked || !permissionList.length">
+		</Textarea>
 				<span class="reason-tips" style="font-size: 12px">
 					{{ t('applyReasonTips') }}
 				</span>
@@ -64,7 +71,8 @@ import {
 	Textarea,
 	message,
 	Tree,
-	Spin
+	Spin,
+	Button
 } from 'ant-design-vue';
 import SuccessModal from './success-modal.vue';
 import ApprovalSteps from './approval-steps.vue';
@@ -94,6 +102,14 @@ const props = defineProps({
 	spining: {
 		type: Boolean,
 		default: false
+	},
+	defaultCheckedIds: {
+		type: Array as PropType<string[]>,
+		default: () => []
+	},
+	isAllChecked: {
+		type: Boolean,
+		default: false
 	}
 
 });
@@ -130,6 +146,10 @@ const getValidTimeOptions = async () => {
 
 getValidTimeOptions();
 const handleOk = async () => {
+	if (props.isAllChecked || !permissionList.value.length) {
+		open.value = false;
+		return;
+	}
 	await Promise.all([formRef.value.validate(), categoryRef.value?.validate()])
 	loading.value = true;
 	const params = getParams();
@@ -161,7 +181,7 @@ const getParams = () => {
 
 	});
 	deepTree(permissionList.value, (item: any) => {
-		if (!item.children && formState.features.includes(item.feature)) {
+		if (!item.children && formState.features.includes(item.feature) && !item.disabled) {
 			roleVoList.push({
 				roleId: item.roleId,
 				validTime: item.validTime
@@ -188,20 +208,22 @@ const onChangeTime = throttle(async () => {
 	if (params.roleVoList.length === 0) {
 		stepNodes.value = [];
 		return;
-	}
+	};
+
 	let res = await Http.getFlowPreview(params);
 	stepNodes.value = res?.body?.nodes || [];
-}, 0)
+}, 1)
 const onCheck = (checkedIds: any, info: any) => {
 	// 如果选择的是子节点，判断是否超过5个，超过的话，删除当前选的节点，并给予提示
 	// 如果选择的是父节点，判断是否超过5个，超过的话，从当前选择的父节点的叶子节点中删除多出的个数，并给予提示
 	let total = 0;
 	let curTotal = 0;
+
 	deepTree(permissionList.value, (item: any) => {
-		if (!item.children && checkedIds.includes(item.feature)) {
+		if (!item.children && checkedIds.includes(item.feature) && !item.disabled) {
 			total += 1;
 		}
-		if (!item.children && formState.features.includes(item.feature)) {
+		if (!item.children && formState.features.includes(item.feature) && !item.disabled) {
 			curTotal += 1;
 		}
 		if (!item.children && !formState.features.includes(item.feature)) {
@@ -257,6 +279,10 @@ watch(() => props.permissionList, (cur) => {
 	})
 })
 
+watch(() => props.defaultCheckedIds, (cur) => {
+	formState.features = cur.concat(formState.features);
+}, { immediate: true })
+
 watch(() => open.value, (cur) => {
 	if (cur) {
 		formRef.value?.resetFields();
@@ -267,6 +293,13 @@ watch(() => open.value, (cur) => {
 </script>
 
 <style scoped>
+.crane-permission-title-tips {
+	color: #FF4D4F;
+	font-size: 14px;
+	margin-left: 8px;
+	font-weight: 400;
+}
+
 :deep(.yqg-permission-tree-list) {
 	margin-top: 4px;
 }

package/src/components/permission-item.vue

@@ -34,10 +34,11 @@
 
 		<Popover v-if="item.relatedCompleteNames?.length">
 			<template #content>
-				<div style="max-width: 400px;">
-					{{ t('adaptDepartment') }}：{{item.relatedCompleteNames.map((item: any) => {
-						return item;
-					}).join('、')}}
+				<div class="crane-department-wraper">
+					<div>
+						{{ t('adaptDepartment') }}：
+					</div>
+					<div v-for="item in item.relatedCompleteNames">{{ item }}</div>
 				</div>
 			</template>
 			<div class="crane-flex-center crane-margin-left-4">
@@ -67,7 +68,7 @@
 		</Popover>
 
 		<!-- 选择框 -->
-		<span v-if="checkedKeys.includes(item.feature)" class="crane-weak-color crane-margin-left-12">
+		<span v-if="checkedKeys.includes(item.feature) && !item.disabled" class="crane-weak-color crane-margin-left-12">
 			{{ t('availableTime') }}：
 			<Select v-model:value="item.validTime" style="width: 100px"
 				:disabled="item.businessApplyType === OWNER_STATUS"
@@ -145,6 +146,11 @@ const onChangeTimeHandler = () => {
 
 </script>
 <style scoped>
+.crane-department-wraper {
+	max-width: 600px;
+	max-height: 300px;
+	overflow-y: scroll;
+}
 .crane-flex-center {
 	display: flex;
 	align-items: center;

package/src/components/yqg-permission.vue

@@ -42,7 +42,7 @@
 					</div>
 					<div>
 						<Button class="crane-margin-right10" @click="goViewApproval">{{ t('viewApprovalDetail')
-							}}</Button>
+						}}</Button>
 						<Button type="primary" @click="showModal">+ {{ t('applyMore') }}</Button>
 					</div>
 				</template>
@@ -63,7 +63,8 @@
 		</div>
 
 		<ApplyModal v-model="open" :permissionList="permissionList" :spining="loading" :workNumber="workNumber"
-			@onSuccess="() => emit('onSuccess')" @onSubmit="getPermissions">
+			:defaultCheckedIds="defaultCheckedIds" :isAllChecked="isAllChecked" @onSuccess="() => emit('onSuccess')"
+			@onSubmit="getPermissions">
 		</ApplyModal>
 
 	</ConfigProvider>
@@ -130,6 +131,8 @@ const props = defineProps({
 const open = ref(false);
 const curApproving = ref<PermissionType>();
 const loading = ref(false);
+const defaultCheckedIds = ref<string[]>([]);
+const isAllChecked = ref(false);
 let permissionList = ref<PermissionListType>([]);
 let curStatus = ref<Record<string, any>>({
 	imageUrl: noauthority,
@@ -163,7 +166,10 @@ const getPermissions = async () => {
 
 	loading.value = true;
 	const res = await Http.getPermissions(params);
-	permissionList.value = useFormat(res.body || []);
+	const datalist = useFormat(res.body || []);
+	permissionList.value = datalist.data;
+	defaultCheckedIds.value = datalist.checkList;
+	isAllChecked.value = datalist.isAllChecked;
 	curStatus.value = useStatus(permissionList.value, curApproving);
 	loading.value = false;
 };
@@ -202,5 +208,4 @@ watch(() => props.locale, (cur, pre) => {
 .crane-margin-right10 {
 	margin-right: 10px;
 }
-</style>
-../hooks/useSort../hooks/useFormat
+</style>

package/src/hooks/useFormat.ts

@@ -9,6 +9,8 @@ const StatusType = {
     TEMP_OWNER: 'TEMP_OWNER'
 }
 export default function useFormat(tree: PermissionListType) {
+    const checkList: string[] = [];
+    let allCount: number = 0;
     function sortTree(
         tree: PermissionListType,
         sortMap: Map<string | null, number>,
@@ -16,26 +18,33 @@ export default function useFormat(tree: PermissionListType) {
     ) {
         return tree.map((node) => {
             node.key = node.feature;
-
+            allCount++;
             if (!node.children || node.children.length === 0) {
                 node.categoryVOS = (node.categoryVOS || []).filter((item: any) => item.configWay !== Category.AUTO);
 
-                if ([StatusType.NO, StatusType.PENDING].includes(node.businessApplyType)) {
+                if ([StatusType.NO].includes(node.businessApplyType)) {
                     node.disabled = true;
                 }
 
-                if ([StatusType.OWNER].includes(node.businessApplyType) && !node.categoryVOS.length) {
+                if (([StatusType.OWNER].includes(node.businessApplyType) && !node.categoryVOS.length) || [StatusType.PENDING].includes(node.businessApplyType)) {
                     node.disabled = true;
+                    checkList.push(node.feature);
                 }
             } else {
                 // 递归对子节点进行排序
                 node.children = sortTree(node.children, sortMap, levelSortMap);
 
+                // 如果所有子节点都在 checkList 中，那么当前节点也加入 checkList
+                if (node.children.every((child) => checkList.includes(child.feature))) {
+                    checkList.push(node.feature);
+                }
+
                 // 检查所有子节点是否 `disabled === true`
                 if (node.children.every((child) => child.disabled)) {
                     node.disabled = true;
                 }
-            }
+            };
+
 
             return node;
         }).sort((a, b) => {
@@ -51,6 +60,10 @@ export default function useFormat(tree: PermissionListType) {
     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);
+    return {
+        data: sortTree(tree, sortMap, levelSortMap),
+        checkList,
+        isAllChecked: allCount === checkList.length
+    };
 }
 

package/src/i18n/en-US.ts

@@ -3,6 +3,7 @@ export default {
     applyPermission: 'Apply for Permission',
     applyReason: 'Application Reason',
     approvalProcess: 'Approval Process',
+    isAllOwnTips: 'The current page already has permission or is under approval, no need to apply',
     applyReasonPlaceholder: 'Please describe the reason for application and usage scenarios in as much detail as possible. Avoid simply stating "work requirements" to prevent delays in the approval process.',
     applyReasonTips: 'Example: Due to requirements of XX project, need to view/operate XXXX scenario/issue, which involves the use of XXX permission, hence submitting this application!',
     cancel: 'Cancel',
@@ -31,7 +32,7 @@ export default {
     maxLengthTips: 'Maximum {length} characters',
     today: 'Expires today',
     clickToApply: 'Click to apply for permission',
-    noPermissionTips: 'No permission points under this menu',
+    noPermissionTips: 'There are no permission points under this menu, no need to apply',
     lastDays: '{count} days',
     categoryTips: 'Your current data scope is as follows:',
     empty: 'Empty',

package/src/i18n/in-ID.ts

@@ -3,6 +3,7 @@ export default {
     applyPermission: 'Ajukan Izin',
     applyReason: 'Alasan Pengajuan',
     approvalProcess: 'Proses Persetujuan',
+    isAllOwnTips: 'Halaman saat ini sudah memiliki izin atau sedang dalam proses persetujuan, tidak perlu mengajukan permohonan',
     applyReasonPlaceholder: 'Harap jelaskan alasan pengajuan dan skenario penggunaan selengkap mungkin. Hindari hanya menyebutkan "kebutuhan kerja" untuk mencegah penundaan dalam proses persetujuan.',
     applyReasonTips: 'Contoh: Karena kebutuhan proyek XX, perlu melihat/mengoperasikan skenario/masalah XXXX, yang melibatkan penggunaan izin XXX, oleh karena itu mengajukan permohonan ini!',
     cancel: 'Batal',
@@ -31,7 +32,7 @@ export default {
     maxLengthTips: 'Maksimal {length} karakter',
     today: 'Kadaluarsa hari ini',
     clickToApply: 'Klik untuk mengajukan izin',
-    noPermissionTips: 'Tidak ada titik izin di menu ini',
+    noPermissionTips: 'Tidak ada titik izin di menu ini, tidak perlu mengajukan permohonan',
     lastDays: '{count} hari',
     categoryTips: 'Cakupan data Anda saat ini adalah sebagai berikut:',
     empty: 'Kosong',

package/src/i18n/zh-CH.ts

@@ -3,6 +3,7 @@ export default {
     applyPermission: '申请权限',
     applyReason: '申请理由',
     approvalProcess: '审批流程',
+    isAllOwnTips: '当前页面权限已拥有或审批中，无需申请',
     applyReasonPlaceholder: '请尽可能详细说明申请原因和使用场景，不要只填写“工作需要”之类的理由，以免影响你获取权限的审批时间。',
     applyReasonTips: '示例：由于XX项目需要，需要查看/操作XXXX场景/问题，涉及到XXX权限的使用，因此提交申请！',
     cancel: '取消',
@@ -31,7 +32,7 @@ export default {
 	maxLengthTips: '最多{length}个字符',
 	today: '今天到期',
     clickToApply: '点击申请权限',
-    noPermissionTips: '该菜单下暂无权限点',
+    noPermissionTips: '该菜单下暂无权限点，无需申请',
     lastDays: '{count}天',
     categoryTips: '当前您所拥有的数据范围如下：',
     empty: '空',

package/src/typings/index.d.ts

@@ -39,6 +39,7 @@ declare type PermissionType = {
 	admin?: any[];
 	checked?: boolean;
 	disabled?: boolean;
+	disableCheckbox?: boolean;
 	children?: PermissionListType;
 };
 declare type PermissionListType = PermissionType[];