@yqg/permission 1.0.6-beta.0 → 1.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@yqg/permission",
-    "version": "1.0.6-beta.0",
+    "version": "1.0.6",
     "main": "dist/index.js",
     "module": "dist/index.js",
     "type": "module",
@@ -13,16 +13,14 @@
         "dev": "vite",
         "preview": "vite preview"
     },
-    "dependencies": {
-        "@ant-design/icons-vue": "^7.0.1",
+    "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": {
+        "vue": "^3.5.12",
         "@typescript-eslint/parser": "^8.13.0",
         "@vitejs/plugin-vue": "^5.1.4",
         "eslint": "^9.14.0",

package/src/App.vue

@@ -8,16 +8,14 @@ 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',
+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',
-            ]);
+                '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';
@@ -40,11 +38,11 @@ const changeLocale = () => {
 			  <!-- 05184 -->
 			<yqg-permission 
 			:permissions="permissions"
-			workNumber="05181"
+			workNumber="EX03385"
 			businessCode="CRANE"
 			:color="color"
 			:locale="locale"
-			@success="() => {console.log('成功')}"
+			@onSuccess="() => {console.log('成功')}"
 			>
 			</yqg-permission>
 		</div>

package/src/components/apply-modal.vue

@@ -5,6 +5,7 @@
 	width="800px"
 	@ok="handleOk"
 	:okText="t('submit')"
+	:maskClosable="false"
 	:ok-button-props="{ loading: loading }"
 	:cancelText="t('cancel')">
 		<Form
@@ -112,7 +113,7 @@
 		},
 		
  	 });
-	const emit = defineEmits(['onSuccess']);
+	const emit = defineEmits(['onSubmit', 'onSuccess']);
 	const open = defineModel({
 		required: true,
 		default: false,
@@ -155,8 +156,8 @@
 			const url = res?.body?.oaFlowUrl;
 			open.value = false;
 			loading.value = false;
-			
-			successModal.value?.countDown(url, () => emit('onSuccess'));
+			emit('onSubmit');
+			successModal.value?.countDown(url, () => emit('onSuccess'));	
     	})
   	}; 
 
@@ -172,8 +173,7 @@
 
   	const onChangeHandler = throttle(async () => {
 		if (formState.roleIds.length > 5) {
-			formState.roleIds.pop();
-			return message.warning(t('maxCountTips', {count: 5}));
+			return;
 		}
 
 		if (!formState.roleIds.length) {
@@ -186,6 +186,14 @@
 		stepNodes.value = res?.body?.nodes || [];
   	}, 0)
 
+	watch(() => formState.roleIds, (val) => {
+		// 写到watch里避免闪烁
+		if (val.length > 5) {
+			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,7 +1,7 @@
 <template>
 	<div class="crane-checkbox-line">
 		<Checkbox 
-		:value="item.roleId" 
+		:value="item.roleId"
 		:disabled="['OWNER', 'PENDING', 'NO'].includes(props.item.businessApplyType)"
 		@change="onCheck">
 			<div class="crane-flex-center crane-checkbox-label">
@@ -30,7 +30,8 @@
 				</Tag>
 				<Popover>
 					<template #content>
-						{{t('lastDays', {count: item?.ownStatusVO?.dayDiff})}}
+						<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'" 

package/src/components/success-modal.vue

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

package/src/components/yqg-permission.vue

@@ -76,7 +76,8 @@
 		 :permissionList="permissionList" 
 		 :workNumber="workNumber"
 		 :businessCode="businessCode"
-		 @onSuccess="getPermissions">
+		 @onSuccess="() => emit('onSuccess')"
+		 @onSubmit="getPermissions">
 		</ApplyModal>
 
 	</ConfigProvider>
@@ -195,6 +196,7 @@
   	};
 
 	const goViewApproval = () => {
+		console.log(curApproving.value)
 		if (curApproving.value?.oaFlowUrl) {
 			window.open(curApproving.value.oaFlowUrl);
 		}
@@ -215,6 +217,7 @@
   	};
 
   	const showModal = () => {
+		getPermissions();
 		open.value = !open.value;
   	};
 

package/src/i18n/en-US.ts

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

package/src/i18n/zh-CH.ts

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

package/src/typings/index.d.ts

@@ -53,3 +53,6 @@ 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" />