@yqg/permission 1.3.1-alpha.1 → 1.3.1-alpha.2

package/package.json

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

package/src/App.vue

@@ -9,7 +9,6 @@ const color = ref<string>('#1677ff');
 const locale = ref<LocaleType>('zh-CN');
 
 const permissions = reactive([
-	'CRANE.APPLY.REQUEST.PERMISSION', 'CRANE.APPLY.REQUEST.ROLE', 'CRANE_APPLY_TABLEAU',
 ]);
 // const permissions = reactive(['CRANE.BUSINESS.QUERY', 'RANE.BUSINESS.CREATE', 'CRANE.BUSINESS.UPDATE', 'CRANE.BUSINESS.DELETE']);
 const changeColor = () => {

package/src/components/apply-modal.vue

@@ -1,12 +1,12 @@
 <template>
 	<Modal v-model:open="open" width="1100px" :maskClosable="false">
 		<template #footer>
-			<Button @click="open = false" v-show="!isAllOwn">{{ t('cancel') }}</Button>
+			<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="isAllOwn" class="crane-permission-title-tips">{{ t('isAllOwnTips') }}</span>
+			<span v-show="isAllChecked" 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"
@@ -37,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 }" :disabled="isAllOwn">
-	</Textarea>
+					:auto-size="{ minRows: 4, maxRows: 4 }" :disabled="isAllChecked || !permissionList.length">
+		</Textarea>
 				<span class="reason-tips" style="font-size: 12px">
 					{{ t('applyReasonTips') }}
 				</span>
@@ -107,7 +107,7 @@ const props = defineProps({
 		type: Array as PropType<string[]>,
 		default: () => []
 	},
-	isAllOwn: {
+	isAllChecked: {
 		type: Boolean,
 		default: false
 	}
@@ -146,7 +146,7 @@ const getValidTimeOptions = async () => {
 
 getValidTimeOptions();
 const handleOk = async () => {
-	if (props.isAllOwn) {
+	if (props.isAllChecked || !permissionList.value.length) {
 		open.value = false;
 		return;
 	}

package/src/components/permission-item.vue

@@ -38,9 +38,7 @@
 					<div>
 						{{ t('adaptDepartment') }}：
 					</div>
-					{{item.relatedCompleteNames.map((item: any) => {
-						return item;
-					}).join('、')}}
+					<div v-for="item in item.relatedCompleteNames">{{ item }}</div>
 				</div>
 			</template>
 			<div class="crane-flex-center crane-margin-left-4">

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,7 @@
 		</div>
 
 		<ApplyModal v-model="open" :permissionList="permissionList" :spining="loading" :workNumber="workNumber"
-			:defaultCheckedIds="defaultCheckedIds" :isAllOwn="isAllOwn" @onSuccess="() => emit('onSuccess')"
+			:defaultCheckedIds="defaultCheckedIds" :isAllChecked="isAllChecked" @onSuccess="() => emit('onSuccess')"
 			@onSubmit="getPermissions">
 		</ApplyModal>
 
@@ -132,7 +132,7 @@ const open = ref(false);
 const curApproving = ref<PermissionType>();
 const loading = ref(false);
 const defaultCheckedIds = ref<string[]>([]);
-const isAllOwn = ref(false);
+const isAllChecked = ref(false);
 let permissionList = ref<PermissionListType>([]);
 let curStatus = ref<Record<string, any>>({
 	imageUrl: noauthority,
@@ -168,8 +168,8 @@ const getPermissions = async () => {
 	const res = await Http.getPermissions(params);
 	const datalist = useFormat(res.body || []);
 	permissionList.value = datalist.data;
-	defaultCheckedIds.value = datalist.ownList;
-	isAllOwn.value = datalist.isAllOwn;
+	defaultCheckedIds.value = datalist.checkList;
+	isAllChecked.value = datalist.isAllChecked;
 	curStatus.value = useStatus(permissionList.value, curApproving);
 	loading.value = false;
 };

package/src/hooks/useFormat.ts

@@ -9,7 +9,7 @@ const StatusType = {
     TEMP_OWNER: 'TEMP_OWNER'
 }
 export default function useFormat(tree: PermissionListType) {
-    const ownList: string[] = [];
+    const checkList: string[] = [];
     let allCount: number = 0;
     function sortTree(
         tree: PermissionListType,
@@ -22,21 +22,21 @@ 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, 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;
-                    ownList.push(node.feature);
+                    checkList.push(node.feature);
                 }
             } else {
                 // 递归对子节点进行排序
                 node.children = sortTree(node.children, sortMap, levelSortMap);
 
-                // 如果所有子节点都在 ownList 中，那么当前节点也加入 ownList
-                if (node.children.every((child) => ownList.includes(child.feature))) {
-                    ownList.push(node.feature);
+                // 如果所有子节点都在 checkList 中，那么当前节点也加入 checkList
+                if (node.children.every((child) => checkList.includes(child.feature))) {
+                    checkList.push(node.feature);
                 }
 
                 // 检查所有子节点是否 `disabled === true`
@@ -62,8 +62,8 @@ export default function useFormat(tree: PermissionListType) {
 
     return {
         data: sortTree(tree, sortMap, levelSortMap),
-        ownList,
-        isAllOwn: allCount === ownList.length
+        checkList,
+        isAllChecked: allCount === checkList.length
     };
 }
 

package/src/i18n/zh-CH.ts

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