@yqg/permission 1.1.0-beta.0 → 1.1.1-beta.0

package/package.json

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

package/src/App.vue

@@ -8,14 +8,7 @@ type LocaleType = 'zh-CN' | 'en-US' | 'id-ID' | 'fil-PH';
 const color = ref<string>('#1677ff');
 const locale = ref<LocaleType>('zh-CN');
 
-const permissions = reactive(['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(['PPDL.0801-test2.XIUGAI.test5', 'PPDL.0801-test2.XIUGAI.test4', 'PPDL.0801-test2.XIUGAI.test6']);
 // const permissions = reactive(['CRANE.BUSINESS.QUERY', 'RANE.BUSINESS.CREATE', 'CRANE.BUSINESS.UPDATE', 'CRANE.BUSINESS.DELETE']);
 const changeColor = () => {
 	color.value = color.value === '#f00' ? '#1677ff' : '#f00';
@@ -38,11 +31,11 @@ const changeLocale = () => {
 			  <!-- 05184 -->
 			<yqg-permission 
 			:permissions="permissions"
-			workNumber="05181"
-			businessCode="CRANE"
+			workNumber="H00408"
+			businessCode="PPDL"
 			:color="color"
 			:locale="locale"
-			@onSuccess="() => {console.log('成功')}"
+			@success="() => {console.log('成功')}"
 			>
 			</yqg-permission>
 		</div>

package/src/components/apply-modal.vue

@@ -5,7 +5,6 @@
 	width="800px"
 	@ok="handleOk"
 	:okText="t('submit')"
-	:maskClosable="false"
 	:ok-button-props="{ loading: loading }"
 	:cancelText="t('cancel')">
 		<Form
@@ -35,14 +34,14 @@
 
 			<FormItem 
 			name="applyReason"
-			:label="t('applyReason')"
+			:label="t('applyReason')" 
 			:rules="[{ 
-				required: true, message: t('reasonPlaceholder'), trigger: ['change', 'blur']
+				required: true, message: t('reasonPlaceholder')
 			}, {
-				max: 300, message: t('maxLengthTips', {length: 300}), trigger: ['change', 'blur']
+				max: 300, message: t('maxLengthTips', {length: 300})
 			}]">
 				<Textarea
-				v-model:value.trim="formState.applyReason"
+				v-model:value="formState.applyReason"
 				show-count 
 				:maxlength="300"
 				:placeholder="t('applyReasonPlaceholder')"
@@ -113,7 +112,7 @@
 		},
 		
  	 });
-	const emit = defineEmits(['onSubmit', 'onSuccess']);
+	const emit = defineEmits(['onSuccess']);
 	const open = defineModel({
 		required: true,
 		default: false,
@@ -142,7 +141,6 @@
 		} else {
 			formState.applyReason += `、${item}`;
 		}
-		formRef.value.validateFields(['applyReason']);
 	}
 
   	const handleOk = async() => {
@@ -156,8 +154,8 @@
 			const url = res?.body?.oaFlowUrl;
 			open.value = false;
 			loading.value = false;
-			emit('onSubmit');
-			successModal.value?.countDown(url, () => emit('onSuccess'));	
+			
+			successModal.value?.countDown(url, () => emit('onSuccess'));
     	})
   	}; 
 
@@ -172,8 +170,8 @@
   	}
 
   	const onChangeHandler = throttle(async () => {
-		if (formState.roleIds.length > 1) {
-			return;
+		if (formState.roleIds.length > 5) {
+			return message.warning(t('maxCountTips', {count: 5}));
 		}
 
 		if (!formState.roleIds.length) {
@@ -186,14 +184,6 @@
 		stepNodes.value = res?.body?.nodes || [];
   	}, 0)
 
-	watch(() => formState.roleIds, (val) => {
-		// 写到watch里避免闪烁
-		if (val.length > 1) {
-			formState.roleIds.pop();
-			message.warning(t('maxCountTips', {count: 5}));
-		}
-	})
-
   	watch(() => open.value, (cur) => {
 		if (cur) {
 			formRef.value?.resetFields();

package/src/components/checkbox-item.vue

@@ -1,9 +1,6 @@
 <template>
 	<div class="crane-checkbox-line">
-		<Checkbox 
-		:value="item.roleId"
-		:disabled="['OWNER', 'PENDING', 'NO'].includes(props.item.businessApplyType)"
-		@change="onCheck">
+		<Checkbox :value="item.roleId" :disabled="disabled" @change="onCheck">
 			<div class="crane-flex-center crane-checkbox-label">
 				<Tag
 					v-if="item.securityLevel" 
@@ -22,26 +19,12 @@
 					<span class="crane-text-overflow">{{ item.name }}</span>
 				</Popover>
 				<Tag
-					v-if="item.businessApplyType && item.businessApplyType !== 'TEMP_OWNER'" 
+					v-if="item.businessApplyType" 
 					:bordered="false" 
 					class="crane-tag-position crane-margin-left-4 crane-margin-right-0"
-					:class="['PENDING', 'TEMP_OWNER'].includes(item.businessApplyType) ? '' : 'crane-disabled-color'">
+					:class="item.businessApplyType !== StatusTypePending ? 'crane-disabled-color' : ''">
 					{{ statusMap[item.businessApplyType] }}
 				</Tag>
-				<Popover>
-					<template #content>
-						<span v-if="item?.ownStatusVO?.dayDiff>0">{{t('lastDays', {count: item?.ownStatusVO?.dayDiff})}}</span>
-						<span v-else>{{ t('taday') }}</span>
-					</template>
-					<Tag
-						v-if="item.businessApplyType === 'TEMP_OWNER'" 
-						:bordered="false" 
-						class="crane-tag-position crane-margin-left-4 crane-margin-right-0"
-						:class="['PENDING'].includes(item.businessApplyType) ? '' : 'crane-disabled-color'">
-						{{ statusMap[item.businessApplyType] }}
-					</Tag>
-				</Popover>
-				
 			</div>
 		</Checkbox>
 
@@ -64,7 +47,7 @@
 			</span>
 		</Popover>
 
-		<span v-if="checkedIds.includes(item.roleId)" class="crane-week-color crane-margin-left-12">
+		<span v-show="checkedIds.includes(item.roleId)" class="crane-week-color crane-margin-left-12">
 			{{t('availableTime')}}：
 			<Select
 				v-model:value="validTime"
@@ -115,6 +98,8 @@
   	});
 	const timeStatusOptions = formatOptions('availiables');
 	const statusMap = t('status');
+  	const StatusTypePending = 'PENDING';
+	const disabled = ['NO', 'PENDING'].includes(props.item.businessApplyType);
 	const validTime = ref('');
 
 	//1登录人所在部门 = 权限适用范围，都默认90天，不需要区分等级和类型，

package/src/components/success-modal.vue

@@ -21,13 +21,19 @@
 			onOk: () => {
 				window.open(url);
 				modal1.destroy();
-				callback && callback();
-				window.YQG_PERMISSION_CALLBACK && window.YQG_PERMISSION_CALLBACK();
+				if (callback) {
+					callback();
+				} else {
+					location.reload();
+				}
 			},
 			onCancel: () => {
 				modal1.destroy();
-				callback && callback();
-				window.YQG_PERMISSION_CALLBACK && window.YQG_PERMISSION_CALLBACK();
+				if (callback) {
+					callback();
+				} else {
+					location.reload();
+				}
 			},
 	  	});
 

package/src/components/yqg-permission.vue

@@ -1,11 +1,12 @@
 <template>
 	<ConfigProvider
-	v-if="allPermissions.length"
-	prefixCls="yqg-permission"
-	:theme="{
+		v-if="allPermissions.length"
+		prefixCls="yqg-permission"
+		:theme="{
       	token: {
         	colorPrimary: props.color,
-      	}}">
+      	}}"
+	>
 		<div class="crane-wraper">
 			<template v-if="type==='text'">
 				<TypographyLink @click="showModal">{{t('permissionApply')}}</TypographyLink>
@@ -18,7 +19,7 @@
 			<template v-else>
 				
 				<!-- 可申请 -->
-				<template v-if="curStatus.status === statusMap.DEFAULT">
+				<template v-if="curStatus.status === STATUS_MAP.DEFAULT">
 					<img 
 					:src="curStatus.imageUrl" 
 					height="200" 
@@ -32,7 +33,7 @@
 					</div>
 				</template>
 				<!-- 审批中 -->
-				<template v-if="curStatus.status === statusMap.PENDING">
+				<template v-if="curStatus.status === STATUS_MAP.PENDING">
 					<img 
 					:src="curStatus.imageUrl" 
 					height="200" 
@@ -52,7 +53,7 @@
 					</div>
 				</template>
 				<!-- 不可申请 -->
-				<div v-if="curStatus.status === statusMap.NO" class="crane-wraper">
+				<div v-if="curStatus.status === STATUS_MAP.NO" class="crane-wraper">
 					<img 
 					:src="curStatus.imageUrl" 
 					height="200" 
@@ -76,27 +77,31 @@
 		 :permissionList="permissionList" 
 		 :workNumber="workNumber"
 		 :businessCode="businessCode"
-		 @onSuccess="() => emit('onSuccess')"
-		 @onSubmit="getPermissions">
+		 @onSuccess="getPermissions">
 		</ApplyModal>
 
 	</ConfigProvider>
 </template>
 <script lang="ts" setup>
-	import { ref, defineAsyncComponent, computed, watchEffect, watch} from 'vue';
-	import {Button, ConfigProvider, TypographyLink, Popover } from 'ant-design-vue';
+	import { ref, defineAsyncComponent, computed, watchEffect, watch } from 'vue';
+	import {Button, ConfigProvider, TypographyLink, Popover, message } from 'ant-design-vue';
 	import applyUrl from '@/assets/applying.png';
 	import noauthority from '@/assets/noauthority.png';
 	import Http from '../axios/index';
 	import t from '../utils';
-  	const ApplyModal = defineAsyncComponent(() =>
-		import('./apply-modal.vue')
-	);
-	const statusMap = {
+
+	const STATUS_MAP = {
 		DEFAULT: 'DEFAULT',
 		PENDING: 'PENDING',
 		NO: 'NO',
-	}
+	} as const;
+
+	// 重置 message 类名，避免被全局样式覆盖
+	message.config({prefixCls: 'yqg-permission-message'});
+
+  	const ApplyModal = defineAsyncComponent(() =>
+		import('./apply-modal.vue')
+	);
 
 	const props = defineProps({
 		workNumber: {
@@ -155,7 +160,7 @@
 		flattenData(data);
 		// 需要排序，规则：businessApplyType 为 null 在前面， PENDING. OWNER 在中间， NO 在后面
 		// 然后再根据 L1, L2, L3 排序
-		const sort = [ null, 'TEMP_OWNER', 'PENDING', 'OWNER', 'NO'];
+		const sort = [ null, 'PENDING', 'OWNER', 'NO'];
 		const levelSort = ['L1', 'L2', 'L3'];
 		arr.sort((a, b) => {
 			return sort.indexOf(a.businessApplyType) - sort.indexOf(b.businessApplyType) || levelSort.indexOf(a.securityLevel) - levelSort.indexOf(b.securityLevel);
@@ -170,13 +175,13 @@
 				status: '',
 			};
 		}
-		const current = data.find((per) => per.businessApplyType === statusMap.PENDING);
-		const cannotApply = data.every((per) => per.businessApplyType === statusMap.NO);
+		const current = data.find((per) => per.businessApplyType === STATUS_MAP.PENDING);
+		const cannotApply = data.every((per) => per.businessApplyType === STATUS_MAP.NO);
 		if (current) {
 			curApproving.value = current;
 			return {
 				imageUrl: applyUrl,
-				status: statusMap.PENDING,
+				status: STATUS_MAP.PENDING,
 				tips: t('status.PENDING'),
 				url: current.oaFlowUrl,
 			};
@@ -185,18 +190,17 @@
 	  	if (cannotApply) {
 			return {
 				imageUrl: noauthority,
-				status: statusMap.NO,
+				status: STATUS_MAP.NO,
 				tips: data[0].admin?.map((item) => `${item.name}(${item.departmentName})`)?.join('、'),
 			};
 	  	};
 	  	return {
 			imageUrl: noauthority,
-			status: statusMap.DEFAULT,
+			status: STATUS_MAP.DEFAULT,
 		}
   	};
 
 	const goViewApproval = () => {
-		console.log(curApproving.value)
 		if (curApproving.value?.oaFlowUrl) {
 			window.open(curApproving.value.oaFlowUrl);
 		}

package/src/i18n/en-US.ts

@@ -28,10 +28,6 @@ export default {
     availableTime: '有效期',
 	selectPlaceholder: '请选择权限点',
 	reasonPlaceholder: '请输入申请理由',
-	maxCountTips: '一次最多只可申请{count}个权限',
-	maxLengthTips: '最多{length}个字符',
-	lastDays: '{count}天后到期',
-	taday: '今天到期',
     availiables: {
         SEVEN_DAYS: '7天',
         THIRTY_DAYS: '30天',
@@ -47,8 +43,7 @@ export default {
     status: {
         PENDING: '审批中',
         NO: '不可申请',
-        OWNER: '永久拥有',
-		TEMP_OWNER: '临时拥有',
+        OWNER: '已拥有',
     },
 	operationType: {
 		QUERY: '查询',

package/src/i18n/zh-CH.ts

@@ -30,8 +30,6 @@ export default {
 	reasonPlaceholder: '请输入申请理由',
 	maxCountTips: '一次最多只可申请{count}个权限',
 	maxLengthTips: '最多{length}个字符',
-	lastDays: '{count}天后到期',
-	taday: '今天到期',
     availiables: {
         SEVEN_DAYS: '7天',
         THIRTY_DAYS: '30天',

package/src/typings/index.d.ts

@@ -26,7 +26,6 @@ declare type PermissionType = {
 	businessApplyType: StatusType;
 	oaFlowUrl?: string;
 	children?: PermissionListType;
-	ownStatusVO: any;
 	admin?: any[];
 };
 declare type PermissionListType = PermissionType[];
@@ -53,6 +52,3 @@ declare type formStateType = {
 	submitWorkNumber: string,
 
 };
-declare interface Window {
-	YQG_PERMISSION_CALLBACK: () => void;
-}

package/src/vite-env.d.ts

@@ -1 +1 @@
-/// <reference types="vite/client" />
+/// <reference types="vite/client" />