@yqg/permission 1.0.2-beta.0 → 1.0.4-beta.0

package/package.json

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

package/src/App.vue

@@ -28,9 +28,10 @@ const changeLocale = () => {
 			<div>1:默认组件</div>
 			<!-- 03541 -->
 			 <!-- 02124 -->
+			  <!-- 05184 -->
 			<yqg-permission 
 			:permissions="permissions"
-			workNumber="H00408"
+			workNumber="05184"
 			businessCode="PPDL"
 			:color="color"
 			:locale="locale"

package/src/components/apply-modal.vue

@@ -5,6 +5,7 @@
 	width="800px"
 	@ok="handleOk"
 	:okText="t('submit')"
+	:ok-button-props="{ loading: loading }"
 	:cancelText="t('cancel')">
 		<Form
 		ref="formRef"
@@ -110,6 +111,7 @@
 		required: true,
 		default: false,
 	});
+	const loading = ref(false);
 	const permissionList = toRef(props, 'permissionList');
 	const businessCode = toRef(props, 'businessCode');
 	const submitWorkNumber = toRef(props, 'workNumber');
@@ -137,10 +139,12 @@
 
   	const handleOk = async() => {
 		formRef.value.validate().then(async() => {
+			loading.value = true;
 			const params = getParams();
 			let res = await Http.submitApply(params);
 			const url = res?.body?.oaFlowUrl;
 			open.value = false;
+			loading.value = false;
 			emit('onSuccess');
 			successModal.value?.countDown(url);
     	})

package/src/components/yqg-permission.vue

@@ -2,6 +2,7 @@
 	<ConfigProvider
 	v-if="allPermissions.length"
 	prefixCls="yqg-permission"
+	iconPrefixCls="yqg-permission"
 	:theme="{
       	token: {
         	colorPrimary: props.color,
@@ -23,7 +24,7 @@
 				style="margin-top: calc(50vh - 273px)" />
 				<!-- 可申请 -->
 				<template v-if="curStatus.status === statusMap.DEFAULT">
-					<div style="margin: 10px">
+					<div class="crane-margin10">
 						{{ t('unavailableTips') }}
 					</div>
 					<div>
@@ -31,8 +32,8 @@
 					</div>
 				</template>
 				<!-- 审批中 -->
-				<template v-else-if="curStatus.status === statusMap.PENDING">
-					<div style="margin: 10px">
+				<template v-if="curStatus.status === statusMap.PENDING">
+					<div class="crane-margin10">
 						<span
 							class="crane-unapply"
 							v-html="t('appliedTips', {
@@ -41,16 +42,16 @@
 						</span>
 					</div>
 					<div>
-						<Button style="margin-right: 10px;">{{t('viewApprovalDetail')}}</Button>
+						<Button class="crane-margin-right10" @click="goViewApproval">{{t('viewApprovalDetail')}}</Button>
 						<Button type="primary" @click="showModal">+ {{t('applyMore')}}</Button>
 					</div>
 				</template>
 				<!-- 不可申请 -->
-				<div v-else style="margin: 10px">
+				<div v-if="curStatus.status === statusMap.NO" class="crane-margin10">
 					{{ t('unapplyTips') }}
 					<Popover>
 						<template #content>
-							{{t('manager')}}: {{ curStatus.tips }}
+							<div style="max-width: 400px;">{{t('manager')}}: {{ curStatus.tips }}</div>
 						</template>
 						<span style="color: #1677ff;">{{t('callManager') }}</span>
 					</Popover>
@@ -113,6 +114,7 @@
 	const emit = defineEmits(['onSuccess']);
 
   	const open = ref(false);
+	const curApproving = ref<PermissionType>();
   	let permissionList = ref<PermissionListType>([]);
   	let curStatus = ref<Record<string, any>>({
 		imageUrl: noauthority,
@@ -149,10 +151,16 @@
   	}
 
   	const getStatus = (data: PermissionListType) => {
-		if (!data.length) return curStatus.value;
+		if (!data.length) {
+			return {
+				imageUrl: noauthority,
+				status: '',
+			};
+		}
 		const current = data.find((per) => per.businessApplyType === statusMap.PENDING);
 		const cannotApply = data.every((per) => per.businessApplyType === statusMap.NO);
 		if (current) {
+			curApproving.value = current;
 			return {
 				imageUrl: applyUrl,
 				status: statusMap.PENDING,
@@ -168,9 +176,18 @@
 				tips: data[0].admin?.map((item) => item.name)?.join('、'),
 			};
 	  	};
-	  	return curStatus.value;
+	  	return {
+			imageUrl: noauthority,
+			status: statusMap.DEFAULT,
+		}
   	};
 
+	const goViewApproval = () => {
+		if (curApproving.value?.oaFlowUrl) {
+			window.open(curApproving.value.oaFlowUrl);
+		}
+	};
+
   	const getPermissions = async () => {
 		if (!allPermissions.value.length || !props.businessCode || !props.workNumber) return;
 
@@ -205,5 +222,11 @@
 		font-size: 14px;
 		white-space: nowrap;
   	}
+	.crane-margin10 {
+		margin: 10px;
+	}
+	.crane-margin-right10 {
+		margin-right: 10px;
+	}
 </style>