@yqg/permission 1.0.5-beta.0 → 1.0.7-beta.0

package/dist/{yqg-permission-BrJJoGxC.js → yqg-permission-CIMrprWp.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 v, 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-DA6ClyIX.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 v, 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-BbZYqbTL.js";
 function Mn(e) {
   "@babel/helpers - typeof";
   return Mn = typeof Symbol == "function" && typeof Symbol.iterator == "symbol" ? function(t) {
@@ -16503,6 +16503,7 @@ const Wr = "/admin/crane", Gy = {
   reasonPlaceholder: "请输入申请理由",
   maxCountTips: "一次最多只可申请{count}个权限",
   maxLengthTips: "最多{length}个字符",
+  lastDays: "{count}天后到期",
   availiables: {
     SEVEN_DAYS: "7天",
     THIRTY_DAYS: "30天",
@@ -16583,7 +16584,7 @@ const Wr = "/admin/crane", Gy = {
   emits: ["onSuccess"],
   setup(e, { emit: t }) {
     const n = vg(
-      () => import("./apply-modal-CzowWeBJ.js").then((C) => C.a)
+      () => import("./apply-modal-CufqYkyN.js").then((C) => C.a)
     ), o = {
       DEFAULT: "DEFAULT",
       PENDING: "PENDING",
@@ -16600,7 +16601,7 @@ const Wr = "/admin/crane", Gy = {
         });
       };
       m(C);
-      const I = [null, "PENDING", "OWNER", "NO"], Q = ["L1", "L2", "L3"];
+      const I = [null, "TEMP_OWNER", "PENDING", "OWNER", "NO"], Q = ["L1", "L2", "L3"];
       return h.sort((y, w) => I.indexOf(y.businessApplyType) - I.indexOf(w.businessApplyType) || Q.indexOf(y.securityLevel) - Q.indexOf(w.securityLevel)), h;
     }, u = (C) => {
       var I, Q;
@@ -16625,7 +16626,7 @@ const Wr = "/admin/crane", Gy = {
       };
     }, g = () => {
       var C;
-      (C = i.value) != null && C.oaFlowUrl && window.open(i.value.oaFlowUrl);
+      console.log(i.value), (C = i.value) != null && C.oaFlowUrl && window.open(i.value.oaFlowUrl);
     }, d = async () => {
       if (!l.value.length || !r.businessCode || !r.workNumber) return;
       const C = {
@@ -16760,7 +16761,7 @@ const Wr = "/admin/crane", Gy = {
   for (const [o, r] of t)
     n[o] = r;
   return n;
-}, sw = /* @__PURE__ */ aw(iw, [["__scopeId", "data-v-c3817442"]]), xw = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, sw = /* @__PURE__ */ aw(iw, [["__scopeId", "data-v-a4765cce"]]), xw = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   default: sw
 }, Symbol.toStringTag, { value: "Module" }));

package/package.json

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

package/src/App.vue

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

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
@@ -34,14 +35,14 @@
 
 			<FormItem 
 			name="applyReason"
-			:label="t('applyReason')" 
+			:label="t('applyReason')"
 			:rules="[{ 
-				required: true, message: t('reasonPlaceholder')
+				required: true, message: t('reasonPlaceholder'), trigger: ['change', 'blur']
 			}, {
-				max: 300, message: t('maxLengthTips', {length: 300})
+				max: 300, message: t('maxLengthTips', {length: 300}), trigger: ['change', 'blur']
 			}]">
 				<Textarea
-				v-model:value="formState.applyReason"
+				v-model:value.trim="formState.applyReason"
 				show-count 
 				:maxlength="300"
 				:placeholder="t('applyReasonPlaceholder')"
@@ -141,6 +142,7 @@
 		} else {
 			formState.applyReason += `、${item}`;
 		}
+		formRef.value.validateFields(['applyReason']);
 	}
 
   	const handleOk = async() => {
@@ -171,6 +173,7 @@
 
   	const onChangeHandler = throttle(async () => {
 		if (formState.roleIds.length > 5) {
+			formState.roleIds.pop();
 			return message.warning(t('maxCountTips', {count: 5}));
 		}
 

package/src/components/checkbox-item.vue

@@ -1,6 +1,9 @@
 <template>
 	<div class="crane-checkbox-line">
-		<Checkbox :value="item.roleId" :disabled="disabled" @change="onCheck">
+		<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" 
@@ -19,12 +22,25 @@
 					<span class="crane-text-overflow">{{ item.name }}</span>
 				</Popover>
 				<Tag
-					v-if="item.businessApplyType" 
+					v-if="item.businessApplyType && item.businessApplyType !== 'TEMP_OWNER'" 
 					:bordered="false" 
 					class="crane-tag-position crane-margin-left-4 crane-margin-right-0"
-					:class="item.businessApplyType !== StatusTypePending ? 'crane-disabled-color' : ''">
+					:class="['PENDING', 'TEMP_OWNER'].includes(item.businessApplyType) ? '' : 'crane-disabled-color'">
 					{{ statusMap[item.businessApplyType] }}
 				</Tag>
+				<Popover>
+					<template #content>
+						{{t('lastDays', {count: item?.ownStatusVO?.dayDiff})}}
+					</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>
 
@@ -47,7 +63,7 @@
 			</span>
 		</Popover>
 
-		<span v-show="checkedIds.includes(item.roleId)" class="crane-week-color crane-margin-left-12">
+		<span v-if="checkedIds.includes(item.roleId)" class="crane-week-color crane-margin-left-12">
 			{{t('availableTime')}}：
 			<Select
 				v-model:value="validTime"
@@ -98,8 +114,6 @@
   	});
 	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/yqg-permission.vue

@@ -154,7 +154,7 @@
 		flattenData(data);
 		// 需要排序，规则：businessApplyType 为 null 在前面， PENDING. OWNER 在中间， NO 在后面
 		// 然后再根据 L1, L2, L3 排序
-		const sort = [ null, 'PENDING', 'OWNER', 'NO'];
+		const sort = [ null, 'TEMP_OWNER', '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);
@@ -195,6 +195,7 @@
   	};
 
 	const goViewApproval = () => {
+		console.log(curApproving.value)
 		if (curApproving.value?.oaFlowUrl) {
 			window.open(curApproving.value.oaFlowUrl);
 		}

package/src/i18n/zh-CH.ts

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

package/src/typings/index.d.ts

@@ -26,6 +26,7 @@ declare type PermissionType = {
 	businessApplyType: StatusType;
 	oaFlowUrl?: string;
 	children?: PermissionListType;
+	ownStatusVO: any;
 	admin?: any[];
 };
 declare type PermissionListType = PermissionType[];