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

package/dist/{yqg-permission-Cx73HCrN.js → yqg-permission-Cfoxcf-d.js}

@@ -1,4 +1,4 @@
-import { F as Qe, i as Kn, C as ug, T as Gs, d as k, r as Xe, o as Pe, a as Vn, b as MA, w as V, g as st, p as fe, c as D, e as pe, f as G, u as K, s as Y, h as Se, j as Ge, t as gg, k as I, l as qt, m as Ws, n as fg, q as qn, v as Ks, x as Zt, y as Fe, z as dg, A as pg, B as Pi, D as Cg, E as Vs, G as RA, H as qs, I as Bg, J as hg, K as Bt, L as Si, M as co, N as ht, O as He, P as En, Q as nt, R as vn, S as Eg, U as vg } from "./index-DsIoPFuc.js";
+import { F as Qe, i as Kn, C as ug, T as Gs, d as k, r as Xe, o as Pe, a as Vn, b as MA, w as V, g as st, p as fe, c as D, e as pe, f as G, u as K, s as Y, h as Se, j as Ge, t as gg, k as I, l as qt, m as Ws, n as fg, q as qn, v as Ks, x as Zt, y as Fe, z as dg, A as pg, B as Pi, D as Cg, E as Vs, G as RA, H as qs, I as Bg, J as hg, K as Bt, L as Si, M as co, N as ht, O as He, P as En, Q as nt, R as vn, S as Eg, U as vg } from "./index-DFUPlAqp.js";
 function Mn(e) {
   "@babel/helpers - typeof";
   return Mn = typeof Symbol == "function" && typeof Symbol.iterator == "symbol" ? function(t) {
@@ -16450,6 +16450,10 @@ const Wr = "/admin/crane", Gy = {
   availableTime: "有效期",
   selectPlaceholder: "请选择权限点",
   reasonPlaceholder: "请输入申请理由",
+  maxCountTips: "一次最多只可申请{count}个权限",
+  maxLengthTips: "最多{length}个字符",
+  lastDays: "{count}天后到期",
+  taday: "今天到期",
   availiables: {
     SEVEN_DAYS: "7天",
     THIRTY_DAYS: "30天",
@@ -16465,7 +16469,8 @@ const Wr = "/admin/crane", Gy = {
   status: {
     PENDING: "审批中",
     NO: "不可申请",
-    OWNER: "已拥有"
+    OWNER: "永久拥有",
+    TEMP_OWNER: "临时拥有"
   },
   operationType: {
     QUERY: "查询",
@@ -16504,6 +16509,7 @@ const Wr = "/admin/crane", Gy = {
   maxCountTips: "一次最多只可申请{count}个权限",
   maxLengthTips: "最多{length}个字符",
   lastDays: "{count}天后到期",
+  taday: "今天到期",
   availiables: {
     SEVEN_DAYS: "7天",
     THIRTY_DAYS: "30天",
@@ -16584,7 +16590,7 @@ const Wr = "/admin/crane", Gy = {
   emits: ["onSuccess"],
   setup(e, { emit: t }) {
     const n = vg(
-      () => import("./apply-modal-DEXDzX6B.js").then((h) => h.a)
+      () => import("./apply-modal-SzDVxN-2.js").then((h) => h.a)
     ), o = {
       DEFAULT: "DEFAULT",
       PENDING: "PENDING",

package/package.json

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

package/src/App.vue

@@ -8,9 +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.EMPLOYEE.QUERY', 'CRANE.EMPLOYEE.DETAIL_QUERY', 'CRANE.EMPLOYEE.ATTRIBUTE_CREATE', 'CRANE.EMPLOYEE.ROLE_ASSIGN'
-            ]);
+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';

package/src/components/apply-modal.vue

@@ -172,9 +172,8 @@
   	}
 
   	const onChangeHandler = throttle(async () => {
-		if (formState.roleIds.length > 5) {
-			formState.roleIds.pop();
-			return message.warning(t('maxCountTips', {count: 5}));
+		if (formState.roleIds.length > 1) {
+			return;
 		}
 
 		if (!formState.roleIds.length) {
@@ -187,6 +186,14 @@
 		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,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,19 +21,13 @@
 			onOk: () => {
 				window.open(url);
 				modal1.destroy();
-				if (callback) {
-					callback();
-				} else {
-					location.reload();
-				}
+				callback && callback();
+				window.YQG_PERMISSION_CALLBACK && window.YQG_PERMISSION_CALLBACK();
 			},
 			onCancel: () => {
 				modal1.destroy();
-				if (callback) {
-					callback();
-				} else {
-					location.reload();
-				}
+				callback && callback();
+				window.YQG_PERMISSION_CALLBACK && window.YQG_PERMISSION_CALLBACK();
 			},
 	  	});
 

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" />