@yqg/permission 1.1.0-beta.0 → 1.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@yqg/permission",
-    "version": "1.1.0-beta.0",
+    "version": "1.1.0",
     "main": "dist/index.js",
     "module": "dist/index.js",
     "type": "module",
@@ -13,23 +13,22 @@
         "dev": "vite",
         "preview": "vite preview"
     },
-    "dependencies": {
+    "devDependencies": {
         "@ant-design/icons-vue": "^7.0.1",
         "@commitlint/cli": "^19.5.0",
         "@commitlint/config-conventional": "^19.5.0",
-        "ant-design-vue": "4.x",
-        "axios": "^1.7.7",
-        "vite-plugin-css-injected-by-js": "^3.5.2",
-        "vue": "^3.5.12"
-    },
-    "devDependencies": {
+        "@types/vue": "^2.0.0",
         "@typescript-eslint/parser": "^8.13.0",
         "@vitejs/plugin-vue": "^5.1.4",
+        "ant-design-vue": "4.x",
+        "axios": "^1.7.7",
         "eslint": "^9.14.0",
         "husky": "^9",
         "lint-staged": "^13.2.0",
         "typescript": "~5.5.4",
         "vite": "^5.4.9",
+        "vite-plugin-css-injected-by-js": "^3.5.2",
+        "vue": "^3.5.12",
         "vue-tsc": "^2.1.8"
     }
 }

package/src/App.vue

@@ -8,18 +8,20 @@ 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([
+	'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 = () => {
 	color.value = color.value === '#f00' ? '#1677ff' : '#f00';
-}	
+}
 const changeLocale = () => {
 	locale.value = locale.value === 'zh-CN' ? 'en-US' : 'zh-CN';
 }
@@ -36,44 +38,40 @@ const changeLocale = () => {
 			<!-- 03541 -->
 			 <!-- 02124 -->
 			  <!-- 05184 -->
-			<yqg-permission 
+			<yqg-permission
 			:permissions="permissions"
-			workNumber="05181"
-			businessCode="CRANE"
+			workNumber="05184"
 			:color="color"
 			:locale="locale"
 			@onSuccess="() => {console.log('成功')}"
 			>
 			</yqg-permission>
 		</div>
-		<!-- <data class="case-card">
+		<data class="case-card">
 			<div>2:文字组件</div>
-			<yqg-permission 
-			:permissions="permissions"
-			businessCode="CRANE"
+			<yqg-permission
+			:permissions="['ddd']"
 			:color="color"
 			workNumber="02124"
 			type="text"
 			>
 			</yqg-permission>
 		</data>
-		 -->
 
-		
+
 		<!-- <div class="case-card">
 			<div>3:自定义</div>
-			<yqg-permission 
+			<yqg-permission
 			:permissions="permissions"
-			businessCode="CRANE"
 			:color="color"
 			workNumber="02124"
-			locale="zh-CN" 
+			locale="zh-CN"
 			type="custom"
 			>
 				<div style="color: red;" slot="custom">自定义按钮</div>
 			</yqg-permission>
 		</div> -->
-		
+
 	</div>
 
 </template>

package/src/axios/index.ts

@@ -1,6 +1,6 @@
 import axios from './axios';
 
-const urlPrefix = '/admin/crane';
+const urlPrefix = '/crane';
 
 type apiType = {
 	[key in string]: (params: any) => Promise<{body: any}>

package/src/components/apply-modal.vue

@@ -18,7 +18,11 @@
 			:label="t('applyPermission')" 
 			name="roleIds"
 			:rules="[{ required: true, message: t('selectPlaceholder')}]">
+				<span v-if="!permissionList.length">
+					{{t('noPermissionTips')}}
+				</span>
 				<CheckboxGroup
+				v-else
 				v-model:value="formState.roleIds"
 				style="display: block;"
 				@change="onChangeHandler"
@@ -43,19 +47,12 @@
 			}]">
 				<Textarea
 				v-model:value.trim="formState.applyReason"
-				show-count 
-				:maxlength="300"
 				:placeholder="t('applyReasonPlaceholder')"
-				:auto-size="{ minRows: 2, maxRows: 5 }">
+				:auto-size="{ minRows: 4, maxRows: 4 }">
 				</Textarea>
-				<div style="margin-top: 4px;">
-					<Tag
-					:bordered="false"
-					style="cursor: pointer;"
-					v-for="item in reasons"
-					@click="addReasonHandler(item)"
-					:key="item">{{ item }}</Tag>
-				</div>
+				<span class="reason-tips" style="font-size: 12px">
+					{{t('applyReasonTips')}}
+				</span>
 			</FormItem>
 
 			<FormItem :label="t('approvalProcess')">
@@ -82,7 +79,6 @@
 		FormItem,
 		CheckboxGroup,
 		Textarea,
-		Tag,
 		message
   	} from 'ant-design-vue';
   	import SuccessModal from './success-modal.vue';
@@ -92,12 +88,6 @@
 		import('./checkbox-item.vue')
 	);
 
-	const reasons = [
-		t('applyReason1'),
-		t('applyReason2'),
-		t('applyReason3'),
-	]
-
   	const props = defineProps({
 		permissionList: {
 			type: Array as () => PermissionType[],
@@ -132,18 +122,6 @@
 		applyReason: '',
 		submitWorkNumber: submitWorkNumber.value,
 	});
-	
-	const addReasonHandler = (item: string) => {
-		if (formState.applyReason.includes(item)) {
-			return;
-		}
-		if (!formState.applyReason || formState.applyReason.endsWith('、')) {
-			formState.applyReason += item;
-		} else {
-			formState.applyReason += `、${item}`;
-		}
-		formRef.value.validateFields(['applyReason']);
-	}
 
   	const handleOk = async() => {
 		if (formState.roleIds.length > 5) {
@@ -172,7 +150,7 @@
   	}
 
   	const onChangeHandler = throttle(async () => {
-		if (formState.roleIds.length > 1) {
+		if (formState.roleIds.length > 5) {
 			return;
 		}
 
@@ -188,7 +166,7 @@
 
 	watch(() => formState.roleIds, (val) => {
 		// 写到watch里避免闪烁
-		if (val.length > 1) {
+		if (val.length > 5) {
 			formState.roleIds.pop();
 			message.warning(t('maxCountTips', {count: 5}));
 		}

package/src/components/checkbox-item.vue

@@ -1,29 +1,29 @@
 <template>
 	<div class="crane-checkbox-line">
-		<Checkbox 
+		<Checkbox
 		:value="item.roleId"
 		:disabled="['OWNER', 'PENDING', 'NO'].includes(props.item.businessApplyType)"
 		@change="onCheck">
 			<div class="crane-flex-center crane-checkbox-label">
 				<Tag
-					v-if="item.securityLevel" 
-					:bordered="false" 
-					:color="levelMap[item.securityLevel].color"
+					v-if="item.securityLevel"
+					:bordered="false"
+					:style="{color: levelMap[item.securityLevel].color, background: levelMap[item.securityLevel].background}"
 					class="crane-tag-position">
 					{{ levelMap[item.securityLevel].text }}
 				</Tag>
-				
+
 				<span>{{t(`operationType.${item.operationType}`)}}｜
 				</span>
 				<Popover>
 					<template #content>
-						{{ item.name }}
+						<div style="max-width: 400px;">{{ item.name }}</div>
 					</template>
 					<span class="crane-text-overflow">{{ item.name }}</span>
 				</Popover>
 				<Tag
-					v-if="item.businessApplyType && item.businessApplyType !== 'TEMP_OWNER'" 
-					:bordered="false" 
+					v-if="item.businessApplyType && item.businessApplyType !== 'TEMP_OWNER'"
+					:bordered="false"
 					class="crane-tag-position crane-margin-left-4 crane-margin-right-0"
 					:class="['PENDING', 'TEMP_OWNER'].includes(item.businessApplyType) ? '' : 'crane-disabled-color'">
 					{{ statusMap[item.businessApplyType] }}
@@ -34,33 +34,35 @@
 						<span v-else>{{ t('taday') }}</span>
 					</template>
 					<Tag
-						v-if="item.businessApplyType === 'TEMP_OWNER'" 
-						:bordered="false" 
+						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>
 
 		<Popover v-if="item.desc">
 			<template #content>
-				{{ item.desc }}
+				<div style="max-width: 400px;">{{ item.desc }}</div>
 			</template>
 			<QuestionCircleOutlined class=" crane-week-color"/>
 		</Popover>
 
-		<Popover v-if="item.relatedDepartments">
+		<Popover v-if="item.relatedCompleteNames?.length">
 			<template #content>
-				{{t('adaptDepartment')}}：{{ item.relatedDepartments.map((item: any) => {
-					return item.name;
+				<div  style="max-width: 400px;">
+					{{t('adaptDepartment')}}：{{ item.relatedCompleteNames.map((item: any) => {
+					return item;
 				}).join('、') }}
+				</div>
 			</template>
 			<span class="crane-flex-center crane-margin-left-4">
 				<img :src="departmentImg" height="14" width="14">
-				<span class="crane-week-color crane-margin-left-4">{{ item.relatedDepartments.length }}</span>
+				<span class="crane-week-color crane-margin-left-4">{{ item.relatedCompleteNames.length }}</span>
 			</span>
 		</Popover>
 
@@ -86,16 +88,19 @@
 
 	const levelMap:LevelMapType = {
 		L1: {
-			color: 'green',
-			text: t('levels.L1')
+			color: '#1AA83B',
+			text: t('levels.L1'),
+			background: '#E3F9E9',
 		},
 		L2: {
-			color: 'orange',
-			text: t('levels.L2')
-		},	
+			color: '#F37D1C',
+			text: t('levels.L2'),
+			background: '#FFE4BA'
+		},
 		L3: {
-			color: 'red',
-			text: t('levels.L3')
+			color: '#F2494B',
+			text: t('levels.L3'),
+			background: '#FDCDC5'
 		},
   	};
 
@@ -153,7 +158,7 @@
  }
 .crane-checkbox-line {
 	margin-bottom: 12px;
-	display: flex; 
+	display: flex;
 	align-items: center;
 }
 .crane-checkbox-line:last-child {
@@ -164,8 +169,8 @@
 }
 .crane-tag-position {
 	margin-right: 4px;
-	font-size: 10px; 
-	padding: 2px 4px; 
+	font-size: 10px;
+	padding: 2px 4px;
 	line-height: 12px;
 	font-weight: 500;
  }
@@ -192,5 +197,5 @@
     overflow: hidden;
     text-overflow: ellipsis
  }
- 
+
 </style>

package/src/components/success-modal.vue

@@ -1,5 +1,5 @@
 <template>
-	<contextHolder></contextHolder>	
+	<contextHolder></contextHolder>
 </template>
 <script lang="ts" setup>
   	import { createVNode } from 'vue';
@@ -23,11 +23,17 @@
 				modal1.destroy();
 				callback && callback();
 				window.YQG_PERMISSION_CALLBACK && window.YQG_PERMISSION_CALLBACK();
+				if (!window.YQG_PERMISSION_CALLBACK && !callback) {
+					location.reload();
+				}
 			},
 			onCancel: () => {
 				modal1.destroy();
 				callback && callback();
 				window.YQG_PERMISSION_CALLBACK && window.YQG_PERMISSION_CALLBACK();
+				if (!window.YQG_PERMISSION_CALLBACK && !callback) {
+					location.reload();
+				}
 			},
 	  	});
 

package/src/components/yqg-permission.vue

@@ -1,24 +1,36 @@
 <template>
 	<ConfigProvider
-	v-if="allPermissions.length"
-	prefixCls="yqg-permission"
-	:theme="{
-      	token: {
-        	colorPrimary: props.color,
-      	}}">
+		prefixCls="yqg-permission"
+		:theme="{
+      		token: {
+        		colorPrimary: props.color,
+      		}
+		}"
+	>
 		<div class="crane-wraper">
-			<template v-if="type==='text'">
-				<TypographyLink @click="showModal">{{t('permissionApply')}}</TypographyLink>
+			<template v-if="[COM_TYPE.FLOATBUTTON, COM_TYPE.TEXT].includes(type)">
+				<FloatButton
+					ref="dragElement"
+					type="primary"
+					:tooltip="t('clickToApply')"
+					:style="{
+						right: RIGHT_DEFAULT,
+						top: currentTop,
+					}"
+				>
+					<template #icon>
+						<img :src="applyIconUrl" height="20" width="20"/>
+					</template>
+				</FloatButton>
 			</template>
-			<template v-else-if="type==='custom'">
+			<template v-else-if="type===COM_TYPE.CUSTOM">
 				<div @click="showModal">
-					<slot name="custom"></slot>
+					<slot name="custom"/>
 				</div>
 			</template>
 			<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 +44,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 +64,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" 
@@ -83,20 +95,35 @@
 	</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, Popover , message, FloatButton} from 'ant-design-vue';
 	import applyUrl from '@/assets/applying.png';
+	import applyIconUrl from '@/assets/applyicon.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 = {
+	import useDraggable from '../hooks/useDragable';
+
+	const STATUS_MAP = {
 		DEFAULT: 'DEFAULT',
 		PENDING: 'PENDING',
 		NO: 'NO',
-	}
+	} as const;
+
+	const COM_TYPE = {
+		FLOATBUTTON: 'floatButton',
+		DEFAULT: 'default',
+		TEXT: 'text',	
+		CUSTOM: 'custom',
+	};
+	const RIGHT_DEFAULT = '10px';
+
+	// 重置 message 类名，避免被全局样式覆盖
+	message.config({prefixCls: 'yqg-permission-message'});
+
+  	const ApplyModal = defineAsyncComponent(() =>import('./apply-modal.vue'));
+
+	const emit = defineEmits(['onSuccess']);
 
 	const props = defineProps({
 		workNumber: {
@@ -107,10 +134,6 @@
 			type: [String, Array<String>],
 	  		default: []
   		},
-		businessCode: {
-	  		type: String,
-	  		default: ''
-		},
 		locale: {
 	  		type: String,
 	  		default: 'zh-CN'
@@ -123,9 +146,12 @@
 	  		type: String,
 	  		default: 'default'
 		},
+		top: {
+			type: String,
+			default: '100px'
+		}
 	});
-	const emit = defineEmits(['onSuccess']);
-
+	
   	const open = ref(false);
 	const curApproving = ref<PermissionType>();
   	let permissionList = ref<PermissionListType>([]);
@@ -133,18 +159,27 @@
 		imageUrl: noauthority,
 		status: '',
   	})
+	
   	const allPermissions = computed(() => {
+		permissionList.value = [];
 		if (Array.isArray(props.permissions)) {
-	  		return props.permissions;
-		} else {
-	  		return props.permissions.split(',');
+	  		return props.permissions.filter((item) => item.trim());
 		}
+		return props.permissions?.split(',')?.filter((item) => item.trim()) || [];
   	});
 
+	const businessCode = computed(() => {
+		const code = allPermissions.value[0] || '';
+		if (!code) return '';
+
+		return code.split('.')[0];
+	})
+
   	const formatPermissionsData = (data: PermissionListType) => {
 		const arr:PermissionListType = [];
 		const flattenData = (list: PermissionListType) => {
 			list.forEach((item) => {
+				item.name = item.name.replace(/^[^.]+\./, '');
 				if (item.children) {
 					flattenData(item.children);
 				} else {
@@ -153,13 +188,19 @@
 			})
 		};
 		flattenData(data);
+
 		// 需要排序，规则：businessApplyType 为 null 在前面， PENDING. OWNER 在中间， NO 在后面
 		// 然后再根据 L1, L2, L3 排序
 		const sort = [ null, 'TEMP_OWNER', 'PENDING', 'OWNER', 'NO'];
 		const levelSort = ['L1', 'L2', 'L3'];
+		const sortMap = new Map(sort.map((value, index) => [value, index]));
+		const levelSortMap = new Map(levelSort.map((value, index) => [value, index]));
+
 		arr.sort((a, b) => {
-			return sort.indexOf(a.businessApplyType) - sort.indexOf(b.businessApplyType) || levelSort.indexOf(a.securityLevel) - levelSort.indexOf(b.securityLevel);
+			return (sortMap.get(a.businessApplyType) ?? 0) - (sortMap.get(b.businessApplyType) ?? 0) 
+				|| (levelSortMap.get(a.securityLevel) ?? 0) - (levelSortMap.get(b.securityLevel) ?? 0);
 		});
+
 		return arr;
   	}
 
@@ -167,16 +208,18 @@
 		if (!data.length) {
 			return {
 				imageUrl: noauthority,
-				status: '',
+				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,49 +228,55 @@
 	  	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);
-		}
+		const url = curApproving.value?.oaFlowUrl;
+		if (!url) return;
+		
+		window.open(url, '_blank');
 	};
 
   	const getPermissions = async () => {
-		if (!allPermissions.value.length || !props.businessCode || !props.workNumber) return;
+		const { workNumber } = props;
+		const permissions = allPermissions.value;
+		if (!permissions?.length || !workNumber) return;
 
 		const params = {
-			businessCode: props.businessCode,
-			features: allPermissions.value.toString(),
-			workNumber: props.workNumber,
+			workNumber,
+			features: permissions.toString(),
 		};
 
-		let res = await Http.getPermissions(params);
+		const res = await Http.getPermissions(params);
 		permissionList.value = formatPermissionsData(res.body || []);
+		
 		curStatus.value = getStatus(permissionList.value);
   	};
 
   	const showModal = () => {
+		getPermissions();
 		open.value = !open.value;
   	};
 
+	const { currentTop, dragElement } = useDraggable(props, showModal);
+
   	watchEffect(getPermissions);
 
   	watch(() => props.locale, (cur, pre) => {
 		if (cur === pre) return;
 		localStorage.setItem('permission_locale', props.locale);
   	}, {immediate: true})
-
 </script>
+
 <style scoped>
   	.crane-wraper {
 		display: flex;
@@ -244,3 +293,4 @@
 	}
 </style>
  
+../hooks/useDragable